Mesa (master): nouveau: there may not have been a texture if the fbo was incomplete

Ilia Mirkin imirkin at kemper.freedesktop.org
Wed Mar 19 22:22:25 UTC 2014


Module: Mesa
Branch: master
Commit: e58071355e944138e01939df57f79affca24dec7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e58071355e944138e01939df57f79affca24dec7

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Mon Mar 17 10:37:12 2014 -0400

nouveau: there may not have been a texture if the fbo was incomplete

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.0 10.1" <mesa-stable at lists.freedesktop.org>

---

 src/mesa/drivers/dri/nouveau/nouveau_fbo.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index ae50fe0..6c479f5 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);
 }
 
 static int




More information about the mesa-commit mailing list