From 4a9480b64aed6986095c391ebba6b91212fb9277 Mon Sep 17 00:00:00 2001 From: Charmaine Lee Date: Fri, 21 Aug 2015 11:41:26 -0700 Subject: [PATCH] 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 --- src/gallium/drivers/svga/svga_pipe_sampler.c | 4 ++-- 1 file 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; -- 2.30.2