diff options
| author | Marek Olšák <maraeo@gmail.com> | 2009-10-29 23:48:59 +0100 |
|---|---|---|
| committer | Joakim Sindholt <opensource@zhasha.com> | 2009-10-31 07:30:47 +0100 |
| commit | ace78d90ded52d8fe4b3b077abf9a4db381dce16 (patch) | |
| tree | 1712b31ec211e8840bec8805a51f96252fbeb48d | |
| parent | 5cf7c8e2d58a877bfc786f866d4e0d363ddd22aa (diff) | |
r300g: fix crash in r300_is_texture_referenced
Also, a subtle fix in emitting a texture state
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index e45564b54e8..02f201b49ad 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -80,7 +80,7 @@ r300_is_texture_referenced(struct pipe_context *pipe, struct pipe_texture *texture, unsigned face, unsigned level) { - struct pipe_buffer* buf; + struct pipe_buffer* buf = 0; r300_get_texture_buffer(texture, &buf, NULL); diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index 2a8e4a9f410..3b0b41e486f 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -540,7 +540,7 @@ void r300_emit_texture(struct r300_context* r300, CS_LOCALS(r300); /* to emulate 1D textures through 2D ones correctly */ - if (tex->tex.height[0] == 1) { + if (tex->tex.target == PIPE_TEXTURE_1D) { filter0 &= ~R300_TX_WRAP_T_MASK; filter0 |= R300_TX_WRAP_T(R300_TX_CLAMP_TO_EDGE); } |