Mesa (master): intel: Mark the FBO as incomplete if there' s no intel_renderbuffer for it.
Eric Anholt
anholt at kemper.freedesktop.org
Thu May 21 17:48:29 UTC 2009
Module: Mesa
Branch: master
Commit: 8bba183b9eeb162661a287bf2e118c6dd419dd24
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8bba183b9eeb162661a287bf2e118c6dd419dd24
Author: Eric Anholt <eric at 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.
---
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 52647dd..0b0f0f9 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -679,6 +679,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:
More information about the mesa-commit
mailing list