Lower default buffer size to the Spec's minimum for 2D images (4096)

The tests used 16384 which is beyond the minimum requirement
for 2D images in both Vulkan 1.0 and Vulkan 1.1.
To compensate for the reduction in buffer size the total number
of workgroups submitted is reduced to a quarter.

Affects:
dEQP-VK.subgroups.*

Components: Vulkan

VK-GL-CTS issue: 717

Change-Id: I75b30186f5489c764411fb8801a1ca4cbfe0ebf8

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
index f11c701..bc93a46 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
@@ -37,7 +37,7 @@ namespace
 {
 static const deUint32                  ELECTED_VALUE           = 42u;
 static const deUint32                  UNELECTED_VALUE         = 13u;
-static const vk::VkDeviceSize  SHADER_BUFFER_SIZE      = 16384ull; //maxUniformBufferRange 128*128
+static const vk::VkDeviceSize  SHADER_BUFFER_SIZE      = 4096ull; // min(maxUniformBufferRange, maxImageDimension1D)
 
 static bool checkFragmentSubgroupElect(std::vector<const void*> datas,
                                                                           deUint32 width, deUint32 height, deUint32)

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
index 66a6dea..f8aeb30 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
@@ -2704,7 +2704,7 @@ tcu::TestStatus vkt::subgroups::makeComputeTest(
        const Unique<VkCommandBuffer> cmdBuffer(
                makeCommandBuffer(context, *cmdPool));
 
-       const deUint32 numWorkgroups[3] = {4, 4, 4};
+       const deUint32 numWorkgroups[3] = {4, 2, 2};
 
        const deUint32 localSizesToTestCount = 15;
        deUint32 localSizesToTest[localSizesToTestCount][3] =