Mesa (master): mesa: check renderbuffer is defined before use.

Alan Hourihane alanh at kemper.freedesktop.org
Thu Mar 19 13:59:19 UTC 2009


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

Author: Alan Hourihane <alanh at vmware.com>
Date:   Thu Mar 19 13:58:04 2009 +0000

mesa: check renderbuffer is defined before use.

---

 src/mesa/state_tracker/st_atom_framebuffer.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index b32009c..df0f093 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -112,15 +112,17 @@ update_framebuffer_state( struct st_context *st )
    for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
       strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);
 
-      /*printf("--------- framebuffer surface rtt %p\n", strb->rtt);*/
-      if (strb->rtt) {
-         /* rendering to a GL texture, may have to update surface */
-         update_renderbuffer_surface(st, strb);
-      }
+      if (strb) {
+         /*printf("--------- framebuffer surface rtt %p\n", strb->rtt);*/
+         if (strb->rtt) {
+            /* rendering to a GL texture, may have to update surface */
+            update_renderbuffer_surface(st, strb);
+         }
 
-      if (strb->surface) {
-         framebuffer->cbufs[framebuffer->nr_cbufs] = strb->surface;
-         framebuffer->nr_cbufs++;
+         if (strb->surface) {
+            framebuffer->cbufs[framebuffer->nr_cbufs] = strb->surface;
+            framebuffer->nr_cbufs++;
+         }
       }
    }
 




More information about the mesa-commit mailing list