Revert "Temporarily fix pipelineStageCreationFeedbackCount = 0 issue"
This reverts commit 5a98cec2fd67ecdb7f1dcad8ff0b0dfff4127191.
Reason for revert: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3736 fixed upstream.
Bug: b/245568070
Change-Id: Ieade1c4d668a13caf9be582d178623a58e15421a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/69108
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
diff --git a/tests/regres/deqp-patches/deqp-zero-feedback-count.patch b/tests/regres/deqp-patches/deqp-zero-feedback-count.patch
deleted file mode 100644
index 81fc8d8..0000000
--- a/tests/regres/deqp-patches/deqp-zero-feedback-count.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- .../modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp
-index d9d89387f..1c6ae0605 100644
---- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp
-+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp
-@@ -625,14 +625,14 @@ void GraphicsCacheTestInstance::preparePipelineWrapper (GraphicsPipelineWrapper&
- {
- // setup proper stages count for CreationFeedback structures
- // that will be passed to pre-rasterization and fragment shader states
-- pipelineCreationFeedbackCreateInfo[1].pipelineStageCreationFeedbackCount = geometryStages;
-+ pipelineCreationFeedbackCreateInfo[1].pipelineStageCreationFeedbackCount = zeroOutFeedbackCount ? 0u : geometryStages;
- pipelineCreationFeedbackCreateInfo[1].pPipelineStageCreationFeedbacks = pipelineStageCreationFeedbacks;
-- pipelineCreationFeedbackCreateInfo[2].pipelineStageCreationFeedbackCount = 1u;
-+ pipelineCreationFeedbackCreateInfo[2].pipelineStageCreationFeedbackCount = zeroOutFeedbackCount ? 0u : 1u;
- pipelineCreationFeedbackCreateInfo[2].pPipelineStageCreationFeedbacks = pipelineStageCreationFeedbacks + geometryStages;
-
- if (m_param->getPipelineConstructionType() == PIPELINE_CONSTRUCTION_TYPE_LINK_TIME_OPTIMIZED_LIBRARY)
- {
-- pipelineCreationFeedbackCreateInfo[4].pipelineStageCreationFeedbackCount = 1u + geometryStages;
-+ pipelineCreationFeedbackCreateInfo[4].pipelineStageCreationFeedbackCount = zeroOutFeedbackCount ? 0u : (1u + geometryStages);
- pipelineCreationFeedbackCreateInfo[4].pPipelineStageCreationFeedbacks = pipelineStageCreationFeedbacks;
- }
- }
diff --git a/tests/regres/deqp.json b/tests/regres/deqp.json
index 1259c57..fc7732b 100644
--- a/tests/regres/deqp.json
+++ b/tests/regres/deqp.json
@@ -4,7 +4,6 @@
"sha": "7aaf3aef809de09834ff355f38917d8a16830ec8",
"patches": [
"tests/regres/deqp-patches/deqp-x11.patch",
- "tests/regres/deqp-patches/deqp-oob-read-fix.patch",
- "tests/regres/deqp-patches/deqp-zero-feedback-count.patch"
+ "tests/regres/deqp-patches/deqp-oob-read-fix.patch"
]
}
