Mesa (7.9): llvmpipe: fix broken stencil writemask

[Brian Paul]

Module: Mesa
Branch: 7.9
Commit: 564a6a15fe10cf8d50caf892b0426798991c7c6c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=564a6a15fe10cf8d50caf892b0426798991c7c6c

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Dec  3 09:47:23 2010 -0700

llvmpipe: fix broken stencil writemask

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32070
(cherry picked from commit dbf996f30856c000e18e3700f741d4e92561b4ec)

Conflicts:

	src/gallium/drivers/llvmpipe/lp_bld_depth.c

---

 src/gallium/drivers/llvmpipe/lp_bld_depth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_bld_depth.c b/src/gallium/drivers/llvmpipe/lp_bld_depth.c
index 99a768a..749ae66 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_depth.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_depth.c
@@ -262,7 +262,7 @@ lp_build_stencil_op_single(struct lp_build_context *bld,
       LLVMValueRef writemask = lp_build_const_int_vec(type, stencil->writemask);
       mask = LLVMBuildAnd(bld->builder, mask, writemask, "");
       /* res = (res & mask) | (stencilVals & ~mask) */
-      res = lp_build_select_bitwise(bld, writemask, res, stencilVals);
+      res = lp_build_select_bitwise(bld, mask, res, stencilVals);
    }
    else {
       /* res = mask ? res : stencilVals */