Fix flush memory range in robustness vertex access tests

The size in VkMappedMemoryRange used in vkFlushMappedMemoryRanges must
either be a multiple of VkPhysicalDeviceLimits::nonCoherentAtomSize or
offset + size must be equal to the size of memory

Components: Vulkan

VK-GL-CTS issue: 4045

Affected tests:
dEQP-VK.robustness.vertex_access.r32_sint.draw.*

Change-Id: I3d0944b6c6808dc66de0c9dc25f6c4e99578a1cf

diff --git a/external/vulkancts/modules/vulkan/robustness/vktRobustnessVertexAccessTests.cpp b/external/vulkancts/modules/vulkan/robustness/vktRobustnessVertexAccessTests.cpp
index cada908..ef56d11 100644 (file)
--- a/external/vulkancts/modules/vulkan/robustness/vktRobustnessVertexAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/robustness/vktRobustnessVertexAccessTests.cpp
@@ -177,6 +177,7 @@ protected:
        Move<VkBuffer>                                          m_outBuffer; // SSBO
        VkDeviceSize                                            m_outBufferSize;
        de::MovePtr<Allocation>                         m_outBufferAlloc;
+       VkDeviceSize                                            m_outBufferAllocSize;
 
        Move<VkDescriptorPool>                          m_descriptorPool;
        Move<VkDescriptorSetLayout>                     m_descriptorSetLayout;
@@ -657,8 +658,10 @@ VertexAccessInstance::VertexAccessInstance (Context&                                               context,
                        &queueFamilyIndex                                                       // const deUint32*              pQueueFamilyIndices;
                };
 
-               m_outBuffer                     = createBuffer(vk, *m_device, &outBufferParams);
-               m_outBufferAlloc        = memAlloc.allocate(getBufferMemoryRequirements(vk, *m_device, *m_outBuffer), MemoryRequirement::HostVisible);
+               m_outBuffer                                                             = createBuffer(vk, *m_device, &outBufferParams);
+               const VkMemoryRequirements requirements = getBufferMemoryRequirements(vk, *m_device, *m_outBuffer);
+               m_outBufferAlloc                                                = memAlloc.allocate(requirements, MemoryRequirement::HostVisible);
+               m_outBufferAllocSize                                    = requirements.size;
 
                VK_CHECK(vk.bindBufferMemory(*m_device, *m_outBuffer, m_outBufferAlloc->getMemory(), m_outBufferAlloc->getOffset()));
                deMemset(m_outBufferAlloc->getHostPtr(), 0xFF, (size_t)m_outBufferSize);
@@ -774,7 +777,7 @@ tcu::TestStatus VertexAccessInstance::iterate (void)
                        DE_NULL,                                                                //  const void*         pNext;
                        m_outBufferAlloc->getMemory(),                  //  VkDeviceMemory      mem;
                        0ull,                                                                   //  VkDeviceSize        offset;
-                       m_outBufferSize,                                                //  VkDeviceSize        size;
+                       m_outBufferAllocSize,                                   //  VkDeviceSize        size;
                };
 
                VK_CHECK(vk.invalidateMappedMemoryRanges(*m_device, 1u, &outBufferRange));
@@ -804,7 +807,7 @@ bool VertexAccessInstance::verifyResult (void)
                DE_NULL,                                                                // const void*          pNext;
                m_outBufferAlloc->getMemory(),                  // VkDeviceMemory       mem;
                m_outBufferAlloc->getOffset(),                  // VkDeviceSize         offset;
-               m_outBufferSize,                                                // VkDeviceSize         size;
+               m_outBufferAllocSize,                                   // VkDeviceSize         size;
        };
 
        VK_CHECK(vk.invalidateMappedMemoryRanges(*m_device, 1u, &outBufferRange));