From: James Legg <jlegg@feralinteractive.com>
Date: Fri, 23 May 2014 11:25:37 +0000 (+0100)
Subject: mesa: Fix unbinding GL_DEPTH_STENCIL_ATTACHMENT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=846c715abb17e13a5d39c565d0995404b6178d98;p=mesa.git

mesa: Fix unbinding GL_DEPTH_STENCIL_ATTACHMENT

glFramebufferRender(..., GL_DEPTH_STENCIL_ATTACHMENT, ..., 0) only
detached the depth buffer and not the stencil buffer.

Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=79115
Reviewed-by: Brian Paul <brianp@vmware.com>
Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 97538bc7b29..ae3a418cd1c 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -500,6 +500,12 @@ _mesa_framebuffer_renderbuffer(struct gl_context *ctx,
    }
    else {
       remove_attachment(ctx, att);
+      if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+         /* detach stencil (depth was detached above) */
+         att = get_attachment(ctx, fb, GL_STENCIL_ATTACHMENT_EXT);
+         assert(att);
+         remove_attachment(ctx, att);
+      }
    }
 
    invalidate_framebuffer(fb);