summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Legg <jlegg@feralinteractive.com>2014-05-23 12:25:37 +0100
committerIan Romanick <ian.d.romanick@intel.com>2014-05-23 09:56:26 -0700
commita1fff38c9688359c9eaa119e14f84b0609a9225b (patch)
tree7092fff7ab15535e7302a261ada61be7bfb9bcb5
parent1db3ebd8a582e490a2ec32df14009125bddd7d4d (diff)
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> (cherry picked from commit 846c715abb17e13a5d39c565d0995404b6178d98)
-rw-r--r--src/mesa/main/fbobject.c6
1 files changed, 6 insertions, 0 deletions
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);