From: Brian Paul <brianp@vmware.com>
Date: Thu, 27 May 2010 19:05:23 +0000 (-0600)
Subject: mesa: fix incorrect GL_DEPTH_STENCIL_ATTACHMENT format check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a504f2387e2bb47025c7406d9a466a042dc09e61;p=mesa.git

mesa: fix incorrect GL_DEPTH_STENCIL_ATTACHMENT format check

We want to check the incoming renderbuffer format, not the (potentially
non-existant) current attachment.

Fixes segfault w/ fbotexture -ds2.

NOTE: this will be applied to the 7.8 branch too.
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index bf445d2b299..bc4741b279d 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1802,10 +1802,10 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
       rb = NULL;
    }
 
-   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT &&
+       rb && rb->Format != MESA_FORMAT_NONE) {
       /* make sure the renderbuffer is a depth/stencil format */
-      const GLenum baseFormat =
-         _mesa_get_format_base_format(att->Renderbuffer->Format);
+      const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);
       if (baseFormat != GL_DEPTH_STENCIL) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glFramebufferRenderbufferEXT(renderbuffer"