From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 13 Mar 2009 15:49:49 +0000 (+0000)
Subject: mesa/st: add check for null front renderbuffer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3be1651f4a45660b447881f7c61c03a1b24302a;p=mesa.git

mesa/st: add check for null front renderbuffer

Not sure if this indicates a problem elsewhere, but without this check
trivial/tri-fbo.c segfaults on resize.  With the patch, it renders
correctly.
---

diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 4fdb6730879..7d7d3823c99 100644
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -63,16 +63,19 @@ display_front_buffer(struct st_context *st)
    GLframebuffer *fb = st->ctx->DrawBuffer;
    struct st_renderbuffer *strb
       = st_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
-   struct pipe_surface *front_surf = strb->surface;
 
-   /* Hook for copying "fake" frontbuffer if necessary:
-    */
-   st->pipe->screen->flush_frontbuffer( st->pipe->screen, front_surf,
-                                        st->pipe->priv );
-
-   /*
-   st->frontbuffer_status = FRONT_STATUS_UNDEFINED;
-   */
+   if (strb) {
+      struct pipe_surface *front_surf = strb->surface;
+      
+      /* Hook for copying "fake" frontbuffer if necessary:
+       */
+      st->pipe->screen->flush_frontbuffer( st->pipe->screen, front_surf,
+                                           st->pipe->priv );
+
+      /*
+        st->frontbuffer_status = FRONT_STATUS_UNDEFINED;
+      */
+   }
 }