summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCharmaine Lee <[email protected]>2015-08-21 11:41:26 -0700
committerBrian Paul <[email protected]>2015-09-02 13:22:42 -0600
commit4a9480b64aed6986095c391ebba6b91212fb9277 (patch)
treea55d654fd00730a0a36a7640bccf58bea035ff6f /src
parent5a5e5e39592292a8ffa861e6f9b21934af428b9b (diff)
svga: fix referencing a NULL framebuffer cbuf
Check for a valid framebuffer cbuf pointer before accessing its associated surface. Fix piglit test fbo-drawbuffers-none. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/svga/svga_pipe_sampler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c
index ab84ed39602..60e2d44ace4 100644
--- a/src/gallium/drivers/svga/svga_pipe_sampler.c
+++ b/src/gallium/drivers/svga/svga_pipe_sampler.c
@@ -455,8 +455,8 @@ svga_set_sampler_views(struct pipe_context *pipe,
* for the conflicted surface view.
*/
for (i = 0; i < svga->curr.framebuffer.nr_cbufs; i++) {
- struct svga_surface *s = svga_surface(svga->curr.framebuffer.cbufs[i]);
- if (s) {
+ if (svga->curr.framebuffer.cbufs[i]) {
+ struct svga_surface *s = svga_surface(svga->curr.framebuffer.cbufs[i]);
if (svga_check_sampler_view_resource_collision(svga, s->handle, shader)) {
svga->dirty |= SVGA_NEW_FRAME_BUFFER;
break;