summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Legg <jlegg@feralinteractive.com>2014-05-23 12:25:37 +0100
committerCarl Worth <cworth@cworth.org>2014-06-02 11:25:24 -0700
commitee0207a212300cf10478008f0a0d08ca016a711b (patch)
tree7aff4335f9ca58d3d7923f6d09dd29c104a88477
parent36e0e9c5e7027905768672c4b12d9cdb6ad2bf48 (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 8090a63c42c..ce1e4b6a35e 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);