Revert "Regres: Apply lazy initialization patch"
This reverts commit 51b992ff8a8d7243db4d259c3c397ade0148f136.
Reason for revert: The fix landed in upstream dEQP and made it into
the master branch as part of the just-released Vulkan 1.3 CTS.
Fixes: b/208245303
Change-Id: Idbd07ab614b0806be6bfff1ebc0e1a233bf5d46f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/62308
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/tests/regres/deqp-patches/lazy-init.patch b/tests/regres/deqp-patches/lazy-init.patch
deleted file mode 100644
index 815b4b1..0000000
--- a/tests/regres/deqp-patches/lazy-init.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6b4d889d692e830f6001ce417392d9353cc56dc4 Mon Sep 17 00:00:00 2001
-From: Sean Risser <srisser@google.com>
-Date: Thu, 20 Jan 2022 03:35:37 -0500
-Subject: [PATCH] Delay initializing fragment_shading_rate tests
-
-When the shading rate tests were renamed, they turned a delayed call
-to createChildren into an immediate call. For partial test-suite runs,
-this can significantly impact run times. So the
-
-Components: Vulkan
-
-VK-GL_CTS Issue: 3460
-
-Affects:
-dEQP-VK.fragment_shading_rate.*
-
-Change-Id: Ie2bb7a7690b2650006da888433397dae9a5ff7cf
----
-
-diff --git a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateTests.cpp b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateTests.cpp
-index cfd53eb..6e1e0ec 100644
---- a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateTests.cpp
-+++ b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateTests.cpp
-@@ -424,8 +424,9 @@
- parentGroup->addChild(group.release());
- }
-
--void createChildren (tcu::TestContext& testCtx, tcu::TestCaseGroup* group, bool useDynamicRendering)
-+void createChildren (tcu::TestCaseGroup* group, bool useDynamicRendering)
- {
-+ tcu::TestContext& testCtx = group->getTestContext();
- createBasicTests(testCtx, group, useDynamicRendering);
- createAttachmentRateTests(testCtx, group, useDynamicRendering);
-
-@@ -444,11 +445,8 @@
- tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx)
- {
- de::MovePtr<tcu::TestCaseGroup> mainGroup (new tcu::TestCaseGroup(testCtx, "fragment_shading_rate", "Fragment shading rate tests"));
-- de::MovePtr<tcu::TestCaseGroup> renderpass2Group (new tcu::TestCaseGroup(testCtx, "renderpass2", "Draw using render pass object"));
-- de::MovePtr<tcu::TestCaseGroup> dynamicRenderingGroup (new tcu::TestCaseGroup(testCtx, "dynamic_rendering", "Draw using VK_KHR_dynamic_rendering"));
--
-- createChildren(testCtx, renderpass2Group.get(), false);
-- createChildren(testCtx, dynamicRenderingGroup.get(), true);
-+ de::MovePtr<tcu::TestCaseGroup> renderpass2Group (createTestGroup(testCtx, "renderpass2", "Draw using render pass object", createChildren, false));
-+ de::MovePtr<tcu::TestCaseGroup> dynamicRenderingGroup (createTestGroup(testCtx, "dynamic_rendering", "Draw using VK_KHR_dynamic_rendering", createChildren, true));
-
- mainGroup->addChild(renderpass2Group.release());
- mainGroup->addChild(dynamicRenderingGroup.release());
diff --git a/tests/regres/deqp.json b/tests/regres/deqp.json
index a36cbc4..c84eab3 100644
--- a/tests/regres/deqp.json
+++ b/tests/regres/deqp.json
@@ -3,7 +3,6 @@
"branch": "",
"sha": "a3338eb2ded98b5befda64f9325db0d219095a00",
"patches": [
- "tests/regres/deqp-patches/deqp-x11.patch",
- "tests/regres/deqp-patches/lazy-init.patch"
+ "tests/regres/deqp-patches/deqp-x11.patch"
]
}
