Remove 4K min size from dedicated image tests

The tests dEQP-VK.memory.mapping.dedicated_alloc.image.*
all create an image with a minimum size of 4Kx4K, so the
tests in this subgroup  test the exact same image size
regardless of what size the test itself is supposed to be
testing.

This change removes the 4Kx4K minimum to enable
the test to actually test multiple sizes of images.

Affect:

dEQP-VK.memory.mapping.dedicated_alloc.image.*

Components: Vulkan

VK-GL-CTS issue: 1118

Change-Id: I2ba9fa671f20eeb9bfa8b14972c903ac20875425
Test: CtsDeqpTestCases on Pixel
Bug: b/78455246
Cherry-picked from Khronos change: https://gerrit.khronos.org/#/c/2466/

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp
index d1d0ee4..9704490 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp
@@ -306,7 +306,7 @@ Move<VkImage> makeImage (const DeviceInterface& vk, VkDevice device, VkDeviceSiz
 {
        const VkDeviceSize                                      sizeInPixels                                    = (size + 3u) / 4u;
        const deUint32                                          sqrtSize                                                = static_cast<deUint32>(deFloatCeil(deFloatSqrt(static_cast<float>(sizeInPixels))));
-       const deUint32                                          powerOfTwoSize                                  = deMaxu32(deSmallestGreaterOrEquallPowerOfTwoU32(sqrtSize), 4096u);
+       const deUint32                                          powerOfTwoSize                                  = deSmallestGreaterOrEquallPowerOfTwoU32(sqrtSize);
        const VkImageCreateInfo                         colorImageParams                                =
        {
                VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,                                                    // VkStructureType                      sType;