commit e70208e42b5ab745d34abdd8acdfe3db81ab82c1
author Nicolas Capens <capn@google.com> Tue Jan 02 15:10:56 2018 -0500
committer Nicolas Capens <nicolascapens@google.com> Wed Jan 03 14:11:03 2018 +0000
tree a479aa1f8bb6aa96658d0033fc4423ad924f08d4
parent e396a49973b1b89d48738c6af5e5de3f06086fe6

Don't perform very early depth test when overridden by shader.

When the pixel shader writes the depth value, we can't use the
interpolated implicit depth to perform a depth buffer test before the
pixel shader executes.

Change-Id: Icf80de50f4aa79f73b43e341c18478e7fd928b8d
Reviewed-on: https://swiftshader-review.googlesource.com/15608
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Renderer/PixelProcessor.hpp

diff --git a/src/Renderer/PixelProcessor.hpp b/src/Renderer/PixelProcessor.hpp
index bb0ae7e..f248cd5 100644
--- a/src/Renderer/PixelProcessor.hpp
+++ b/src/Renderer/PixelProcessor.hpp
@@ -34,8 +34,8 @@
 
 			int shaderID;
 
-			bool depthOverride                        : 1;
-			bool shaderContainsKill                   : 1;
+			bool depthOverride                        : 1;   // FIXME: Eliminate by querying shader.
+			bool shaderContainsKill                   : 1;   // FIXME: Eliminate by querying shader.
 
 			DepthCompareMode depthCompareMode         : BITS(DEPTH_LAST);
 			AlphaCompareMode alphaCompareMode         : BITS(ALPHA_LAST);

src/Renderer/QuadRasterizer.cpp

diff --git a/src/Renderer/QuadRasterizer.cpp b/src/Renderer/QuadRasterizer.cpp
index e54ba73..6b319b4 100644
--- a/src/Renderer/QuadRasterizer.cpp
+++ b/src/Renderer/QuadRasterizer.cpp
@@ -159,7 +159,7 @@
 				}
 			}
 
-			if(veryEarlyDepthTest && state.multiSample == 1)
+			if(veryEarlyDepthTest && state.multiSample == 1 && !state.depthOverride)
 			{
 				if(!state.stencilActive && state.depthTestActive && (state.depthCompareMode == DEPTH_LESSEQUAL || state.depthCompareMode == DEPTH_LESS))   // FIXME: Both modes ok?
 				{