mesa: Branch 'master'

[Michel Daenzer]

 src/mesa/drivers/dri/i915tex/intel_buffers.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 708d836e6b785764692c485e6cdf42f2b50fcf86 (from 17fb7821d7cdc0ed211eaef013ee7798619a61d3)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Mar 12 19:08:28 2007 +0100

    i915tex: Don't crash when intel_fb->color_rb[i] is NULL.
    
    This can be the case on some systems when running glxinfo.

diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index 45fd2fa..62ff54b 100644
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -327,6 +327,9 @@ intelWindowMoved(struct intel_context *i
 	 }
 
 	 for (i = 0; i < intel_fb->pf_num_pages; i++) {
+	    if (!intel_fb->color_rb[i])
+	       continue;
+
 	    vbl.request.sequence = intel_fb->color_rb[i]->vbl_pending;
 	    drmWaitVBlank(intel->driFd, &vbl);
 	 }
@@ -336,7 +339,8 @@ intelWindowMoved(struct intel_context *i
 	 intel_fb->vbl_waited = intel_fb->vbl_seq;
 
 	 for (i = 0; i < intel_fb->pf_num_pages; i++) {
-	    intel_fb->color_rb[i]->vbl_pending = intel_fb->vbl_waited;
+	    if (intel_fb->color_rb[i])
+	       intel_fb->color_rb[i]->vbl_pending = intel_fb->vbl_waited;
 	 }
       }
    } else {