diff options
author | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
commit | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (patch) | |
tree | 70b5bbde90432287ae91513b8a4edcc55fcf9e9e /mesalib/src/mesa/main/fbobject.c | |
parent | 697c9a1917acd36a1b99e0d263baf2514446ca11 (diff) | |
parent | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff) | |
download | vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.gz vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.bz2 vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/gl_gentable.py
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
-rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 97538bc7b..ae3a418cd 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/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); |