From e2080f6c6575571f6d12224ff96e697b66cd147e Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 8 Dec 2013 17:45:18 +0100 Subject: [PATCH] Revert "STENCIL_VALUE_UNKNOWN for DECR/INCR/INVERT" This reverts commit 59d3b92e710de1ed89b75401e223b24de2ca40fe. Revert "zero alpha if stencil op consistently says to zero for format 5551 as well" This reverts commit ed07a7f4111de8ecd3b6feb4e32597bbd8809c0b. --- GPU/GLES/FragmentShaderGenerator.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/GPU/GLES/FragmentShaderGenerator.cpp b/GPU/GLES/FragmentShaderGenerator.cpp index 5d6114cfd4..33b63bce58 100644 --- a/GPU/GLES/FragmentShaderGenerator.cpp +++ b/GPU/GLES/FragmentShaderGenerator.cpp @@ -149,15 +149,9 @@ StencilValueType ReplaceAlphaWithStencilType() { case GE_STENCILOP_REPLACE: return (gstate.getStencilTestRef() & 0x80) != 0 ? STENCIL_VALUE_ONE : STENCIL_VALUE_ZERO; - case GE_STENCILOP_ZERO: - if (gstate.getStencilOpZFail() == GE_STENCILOP_ZERO) { - return STENCIL_VALUE_ZERO; - } else { - return STENCIL_VALUE_KEEP; - } - // Decrementing always zeros, since there's only one bit. case GE_STENCILOP_DECR: + case GE_STENCILOP_ZERO: return STENCIL_VALUE_ZERO; // Incrementing always fills, since there's only one bit. @@ -186,11 +180,11 @@ StencilValueType ReplaceAlphaWithStencilType() { return STENCIL_VALUE_KEEP; } + // Decrementing always zeros, since there's only one bit. case GE_STENCILOP_DECR: case GE_STENCILOP_INCR: case GE_STENCILOP_INVERT: return STENCIL_VALUE_UNKNOWN; - case GE_STENCILOP_KEEP: return STENCIL_VALUE_KEEP; }