Module: Mesa
Branch: mesa_7_5_branch
Commit: 2b83483fb43386bd4b8d199d371a3e513828695f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b83483fb43386bd4b8d199d371a3e513828695f

Author: Eric Anholt <e...@anholt.net>
Date:   Wed May 20 14:05:03 2009 -0700

intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it.

This happens to rendering with textures with a border, which had resulted
in a segfault on dereferencing the irb.

(cherry-picked from commit 8bba183b9eeb162661a287bf2e118c6dd419dd24)

---

 src/mesa/drivers/dri/intel/intel_fbo.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c 
b/src/mesa/drivers/dri/intel/intel_fbo.c
index 30f58b1..ed7c78e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -680,6 +680,11 @@ intel_validate_framebuffer(GLcontext *ctx, struct 
gl_framebuffer *fb)
       if (rb == NULL)
         continue;
 
+      if (irb == NULL) {
+        fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+        continue;
+      }
+
       switch (irb->texformat->MesaFormat) {
       case MESA_FORMAT_ARGB8888:
       case MESA_FORMAT_RGB565:

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to