Add missing invalidates in renderpass tests

Components: Vulkan
VK-GL-CTS issue: 1367

Affects:
dEQP-VK.renderpass.*

Change-Id: Ie40381c3b36604ed4fcbb2613cc9aa4a54b17a46

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
index dc213ec..8f2371d 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
@@ -1460,8 +1460,11 @@ tcu::TestStatus MultisampleRenderPassTestInstance::iterateInternal (void)
 
                for (deUint32 sampleNdx = 0; sampleNdx < m_sampleCount; sampleNdx++)
                {
+                       Allocation *dstBufMem = m_dstBufferMemory[sampleNdx].get();
+                       invalidateMappedMemoryRange(vkd, device, dstBufMem->getMemory(), dstBufMem->getOffset(), VK_WHOLE_SIZE);
+
                        const std::string                                       name            ("Sample" + de::toString(sampleNdx));
-                       const void* const                                       ptr                     (m_dstBufferMemory[sampleNdx]->getHostPtr());
+                       const void* const                                       ptr                     (dstBufMem->getHostPtr());
                        const tcu::ConstPixelBufferAccess       access          (format, m_width, m_height, 1, ptr);
                        tcu::TextureLevel                                       reference       (format, m_width, m_height);
 

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
index c3c8249..4f54852 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
@@ -966,6 +966,8 @@ tcu::TestStatus SampleReadTestInstance::iterateInternal (void)
        submitCommandsAndWait(vkd, device, m_context.getUniversalQueue(), *commandBuffer);
 
        {
+               invalidateMappedMemoryRange(vkd, device, m_dstBufferMemory->getMemory(), m_dstBufferMemory->getOffset(), VK_WHOLE_SIZE);
+
                const tcu::TextureFormat                        format          (mapVkFormat(VK_FORMAT_R32_UINT));
                const void* const                                       ptr                     (m_dstBufferMemory->getHostPtr());
                const tcu::ConstPixelBufferAccess       access          (format, m_width, m_height, 1, ptr);