diff options
| author | Brian Paul <[email protected]> | 2012-10-10 18:31:52 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-10-11 09:13:59 -0600 |
| commit | 60a9390978db0a3c9b0170c726ebe684baf75734 (patch) | |
| tree | aa22411d0e2ca299295dfcba56df89c50e72e212 | |
| parent | 6c53ec1ef279bd346ec8b59f44520ca79f886c93 (diff) | |
svga: don't use uninitialized framebuffer state
Only the first 'nr_cbufs' color buffers in the pipe_framebuffer_state are
valid. The rest of the color buffer pointers might be unitialized.
Fixes a regression in the piglit fbo-srgb-blit test since changes in the
gallium blitter code.
NOTE: This is a candidate for the 9.0 branch (just to be safe).
Reviewed-by: Jose Fonseca <[email protected]>
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_misc.c b/src/gallium/drivers/svga/svga_pipe_misc.c index 56f25993134..2b6269a7b2e 100644 --- a/src/gallium/drivers/svga/svga_pipe_misc.c +++ b/src/gallium/drivers/svga/svga_pipe_misc.c @@ -107,8 +107,10 @@ static void svga_set_framebuffer_state(struct pipe_context *pipe, } } - for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) - pipe_surface_reference(&dst->cbufs[i], fb->cbufs[i]); + for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) { + pipe_surface_reference(&dst->cbufs[i], + (i < fb->nr_cbufs) ? fb->cbufs[i] : NULL); + } pipe_surface_reference(&dst->zsbuf, fb->zsbuf); |