summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-03-17 10:37:12 -0400
committerCarl Worth <cworth@cworth.org>2014-04-14 15:05:34 -0700
commit1184293f40569d1f3fa25c61d62d02c73260072f (patch)
treeb970b94b48a56db1e0689f9e33fa6d5c53f948cb
parent2bd38301975359f9e4933166ad2816498bb262fd (diff)
nouveau: there may not have been a texture if the fbo was incomplete
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Francisco Jerez <currojerez@riseup.net> Cc: "10.0 10.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit e58071355e944138e01939df57f79affca24dec7)
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_fbo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index 25543e458b4..548a39b905f 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -265,7 +265,8 @@ static void
nouveau_finish_render_texture(struct gl_context *ctx,
struct gl_renderbuffer *rb)
{
- texture_dirty(rb->TexImage->TexObject);
+ if (rb && rb->TexImage)
+ texture_dirty(rb->TexImage->TexObject);
}
void