Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/vulkan-cts-1.2.7

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / robustness / vktRobustnessExtsTests.cpp

diff --git a/external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp b/external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp
index 8fe4ba5..2a857ae 100644 (file)
--- a/external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp
+++ b/external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp
@@ -1722,15 +1722,26 @@ tcu::TestStatus RobustnessExtsTestInstance::iterate (void)
                        (VkDeviceSize)(m_data.bufferLen ? m_data.bufferLen : 1),
                        (VkDeviceSize)256);
 
+               VkBufferUsageFlags usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
                if (m_data.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ||
                        m_data.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC)
                {
                        size = deIntRoundToPow2((int)size, (int)robustness2Properties.robustUniformBufferAccessSizeAlignment);
+                       usage |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
                }
                else if (m_data.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ||
                                 m_data.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
                {
                        size = deIntRoundToPow2((int)size, (int)robustness2Properties.robustStorageBufferAccessSizeAlignment);
+                       usage |= VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
+               }
+               else if (m_data.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER)
+               {
+                       usage |= VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT;
+               }
+               else if (m_data.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER)
+               {
+                       usage |= VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT;
                }
                else if (m_data.descriptorType == VERTEX_ATTRIBUTE_FETCH)
                {
@@ -1738,13 +1749,7 @@ tcu::TestStatus RobustnessExtsTestInstance::iterate (void)
                }
 
                buffer = de::MovePtr<BufferWithMemory>(new BufferWithMemory(
-                       vk, device, allocator, makeBufferCreateInfo(size,
-                                                                                                               VK_BUFFER_USAGE_STORAGE_BUFFER_BIT |
-                                                                                                               VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT |
-                                                                                                               VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT |
-                                                                                                               VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT |
-                                                                                                               VK_BUFFER_USAGE_VERTEX_BUFFER_BIT),
-                                                                                                               MemoryRequirement::HostVisible));
+                       vk, device, allocator, makeBufferCreateInfo(size, usage), MemoryRequirement::HostVisible));
                bufferPtr = (deUint8 *)buffer->getAllocation().getHostPtr();
 
                deMemset(bufferPtr, 0x3f, (size_t)size);