libX11 mesa xserver pixman git update 23 May 2014

xserver          commit db2e708f31a162c6c66643d3559dd5f3e21ee06b
libX11           commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb
pixman           commit 9cd283b2eb8279824406bfd47b020d21fc00cf82
mesa             commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad

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);