commit 36e6c2a89c74db98dbedbc1f5c7d87768f0af8cb
author Nicolas Capens <capn@google.com> Sat Sep 25 04:10:22 2021 +0000
committer Nicolas Capens <nicolascapens@google.com> Mon Sep 27 13:21:18 2021 +0000
tree 1f6a35bed09cb624aa49f6614b3eef06e84879c5
parent c79a36ebf97ac0dfa1d7bbb9557c060bfb6e7683

Revert "Work around dEQP-VK output_location test flakiness"

This reverts commit dc8e77f0e52145b7e0c63eb36c1482e66b87fbff.

Reason for revert: Root cause fixed (https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2510)

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

src/Pipeline/PixelProgram.cpp

diff --git a/src/Pipeline/PixelProgram.cpp b/src/Pipeline/PixelProgram.cpp
index e454c95..bde61eb 100644
--- a/src/Pipeline/PixelProgram.cpp
+++ b/src/Pipeline/PixelProgram.cpp
@@ -212,10 +212,6 @@
 		c[i].y = routine.outputs[i * 4 + 1];
 		c[i].z = routine.outputs[i * 4 + 2];
 		c[i].w = routine.outputs[i * 4 + 3];
-		outputMasks[i] = ((spirvShader->outputs[i * 4 + 0].Type != SpirvShader::ATTRIBTYPE_UNUSED) ? 0x1 : 0x0) |
-		                 ((spirvShader->outputs[i * 4 + 1].Type != SpirvShader::ATTRIBTYPE_UNUSED) ? 0x2 : 0x0) |
-		                 ((spirvShader->outputs[i * 4 + 2].Type != SpirvShader::ATTRIBTYPE_UNUSED) ? 0x4 : 0x0) |
-		                 ((spirvShader->outputs[i * 4 + 3].Type != SpirvShader::ATTRIBTYPE_UNUSED) ? 0x8 : 0x0);
 	}
 
 	clampColor(c);

src/Pipeline/PixelRoutine.cpp

diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index 4166ea1..3e8104c 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -50,11 +50,6 @@
 			routine.inputs[i] = Float4(0.0f);
 		}
 	}
-
-	for(int i = 0; i < MAX_COLOR_BUFFERS; i++)
-	{
-		outputMasks[i] = 0xF;
-	}
 }
 
 PixelRoutine::~PixelRoutine()
@@ -1505,7 +1500,7 @@
 		break;
 	}
 
-	int rgbaWriteMask = state.colorWriteActive(index) & outputMasks[index];
+	int rgbaWriteMask = state.colorWriteActive(index);
 	int bgraWriteMask = (rgbaWriteMask & 0x0000000A) | (rgbaWriteMask & 0x00000001) << 2 | (rgbaWriteMask & 0x00000004) >> 2;
 
 	switch(state.colorFormat[index])
@@ -2534,7 +2529,7 @@
 		UNSUPPORTED("VkFormat: %d", int(state.colorFormat[index]));
 	}
 
-	int rgbaWriteMask = state.colorWriteActive(index) & outputMasks[index];
+	int rgbaWriteMask = state.colorWriteActive(index);
 	int bgraWriteMask = (rgbaWriteMask & 0x0000000A) | (rgbaWriteMask & 0x00000001) << 2 | (rgbaWriteMask & 0x00000004) >> 2;
 
 	Int xMask;  // Combination of all masks

src/Pipeline/PixelRoutine.hpp

diff --git a/src/Pipeline/PixelRoutine.hpp b/src/Pipeline/PixelRoutine.hpp
index a3c731b..4f18959 100644
--- a/src/Pipeline/PixelRoutine.hpp
+++ b/src/Pipeline/PixelRoutine.hpp
@@ -41,8 +41,6 @@
 	Float4 w;     // Used as is
 	Float4 rhw;   // Reciprocal w
 
-	uint32_t outputMasks[MAX_COLOR_BUFFERS];  // TODO(b/162348737): Determine whether unwritten output should be left untouched
-
 	SpirvRoutine routine;
 	const vk::DescriptorSet::Bindings &descriptorSets;