Module: Mesa Branch: 10.1 Commit: ee0207a212300cf10478008f0a0d08ca016a711b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee0207a212300cf10478008f0a0d08ca016a711b
Author: James Legg <[email protected]> Date: Fri May 23 12:25:37 2014 +0100 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 <[email protected]> Cc: "10.1 10.2" <[email protected]> (cherry picked from commit 846c715abb17e13a5d39c565d0995404b6178d98) --- src/mesa/main/fbobject.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 8090a63..ce1e4b6 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
