Mesa (master): st/mesa: don't resolve stencil twice

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: 425b179fafe93ddf4abacbccb67ed6aecbef6a7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=425b179fafe93ddf4abacbccb67ed6aecbef6a7e

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Fri Aug  5 20:10:04 2011 +0200

st/mesa: don't resolve stencil twice

---

 src/mesa/state_tracker/st_cb_blit.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index 626db12..750f541 100644
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -107,8 +107,10 @@ st_BlitFramebuffer_resolve(struct gl_context *ctx,
          dstRb = st_renderbuffer(dstDepth->Renderbuffer);
 
          info->mask = (mask & GL_DEPTH_BUFFER_BIT) ? PIPE_MASK_Z : 0;
-         if (combined && (mask & GL_STENCIL_BUFFER_BIT))
+         if (combined && (mask & GL_STENCIL_BUFFER_BIT)) {
+            mask &= ~GL_STENCIL_BUFFER_BIT;
             info->mask |= PIPE_MASK_S;
+         }
 
          info->src.res = srcRb->texture;
          info->src.layer = srcRb->surface->u.tex.first_layer;