From: Eric Anholt <eric@anholt.net>
Date: Mon, 20 Oct 2014 20:14:57 +0000 (+0100)
Subject: vc4: Fix stencil writemask handling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc298023c9b302a7a24ee01fe2da1c93f5b44666;p=mesa.git

vc4: Fix stencil writemask handling.

If the writemask doesn't compress, then we want to put in the uncompressed
writemask, not the compressed writemask failure value (all-on).

Fixes glean's stencil2 and fbo-clear-formats on stencil.
---

diff --git a/src/gallium/drivers/vc4/vc4_state.c b/src/gallium/drivers/vc4/vc4_state.c
index 99b5b3c7271..bbbb73d4cd6 100644
--- a/src/gallium/drivers/vc4/vc4_state.c
+++ b/src/gallium/drivers/vc4/vc4_state.c
@@ -223,8 +223,8 @@ vc4_create_depth_stencil_alpha_state(struct pipe_context *pctx,
 
                 if (front_writemask_bits == 0xff ||
                     back_writemask_bits == 0xff) {
-                        so->stencil_uniforms[2] = (front_writemask_bits |
-                                                   (back_writemask_bits << 8));
+                        so->stencil_uniforms[2] = (front->writemask |
+                                                   (back_writemask << 8));
                 }
         }