commit a190ceed72930fbfceff5b030490d06289af0972
author Nicolas Capens <capn@google.com> Sat Apr 02 01:52:41 2022 -0400
committer Nicolas Capens <nicolascapens@google.com> Mon Apr 04 02:18:21 2022 +0000
tree 780b0fc1398bbe2385f58c0990ebd58418b4fc94
parent 649d6e46aeaea1740fe8439ce8935142c8c3f36e

Correct border clamp and depth comparison order

The Vulkan spec on 'Texel Input Operations' lists Texel replacement
before Depth comparison.

Bug: b/227518327
Change-Id: I2648289504030a29f184fd342240d7f066d01c54
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/64688
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Pipeline/SamplerCore.cpp

diff --git a/src/Pipeline/SamplerCore.cpp b/src/Pipeline/SamplerCore.cpp
index f126b4b..9f69fc8 100644
--- a/src/Pipeline/SamplerCore.cpp
+++ b/src/Pipeline/SamplerCore.cpp
@@ -2097,6 +2097,11 @@
 		}
 	}
 
+	if(borderModeActive())
+	{
+		c = replaceBorderTexel(c, valid);
+	}
+
 	if(state.compareEnable)
 	{
 		Float4 ref = dRef;
@@ -2129,11 +2134,6 @@
 		c.w = Float4(1.0f);
 	}
 
-	if(borderModeActive())
-	{
-		c = replaceBorderTexel(c, valid);
-	}
-
 	return c;
 }