Fix regression in dEQP-VK.pipeline.multisample.sample_mask

The commit 83f7fcd8 introduced two ways of downloading
rendered images from device (RESOLVE or COPY_SAMPLES).

All previously existing tests should continue to use RESOLVE mode, as
the new COPY_SAMPLES mode changes the behavior of MultisampleRenderer
class (and requries additional set of shaders).

Affects:
dEQP-VK.pipeline.multisample.sample_mask*

Components: Vulkan

VK-GL-CTS issue: 676

Change-Id: I0c59cf0b4c9734c982b78606dc3cc9d1d721b547
(cherry picked from commit e3b288e22f038449559f2ccaa4825856ef729fce)

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
index 194e62eab267de302c58b9c0f796dda5d9f1b182..6d8003d443308105766f7638b9ff1ce043f181f5 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
@@ -1290,7 +1290,7 @@ tcu::TestStatus SampleMaskInstance::iterate (void)
 
        // Render with test flags
        {
-               MultisampleRenderer renderer (m_context, m_colorFormat, m_renderSize, m_primitiveTopology, m_vertices, m_multisampleStateParams, m_colorBlendState, RENDER_TYPE_COPY_SAMPLES);
+               MultisampleRenderer renderer (m_context, m_colorFormat, m_renderSize, m_primitiveTopology, m_vertices, m_multisampleStateParams, m_colorBlendState, RENDER_TYPE_RESOLVE);
                testSampleMaskImage = renderer.render();
        }
 
@@ -1301,7 +1301,7 @@ tcu::TestStatus SampleMaskInstance::iterate (void)
 
                multisampleParams.pSampleMask = sampleMask.data();
 
-               MultisampleRenderer renderer (m_context, m_colorFormat, m_renderSize, m_primitiveTopology, m_vertices, multisampleParams, m_colorBlendState, RENDER_TYPE_COPY_SAMPLES);
+               MultisampleRenderer renderer (m_context, m_colorFormat, m_renderSize, m_primitiveTopology, m_vertices, multisampleParams, m_colorBlendState, RENDER_TYPE_RESOLVE);
                minSampleMaskImage = renderer.render();
        }
 
@@ -1312,7 +1312,7 @@ tcu::TestStatus SampleMaskInstance::iterate (void)
 
                multisampleParams.pSampleMask = sampleMask.data();
 
-               MultisampleRenderer renderer (m_context, m_colorFormat, m_renderSize, m_primitiveTopology, m_vertices, multisampleParams, m_colorBlendState, RENDER_TYPE_COPY_SAMPLES);
+               MultisampleRenderer renderer (m_context, m_colorFormat, m_renderSize, m_primitiveTopology, m_vertices, multisampleParams, m_colorBlendState, RENDER_TYPE_RESOLVE);
                maxSampleMaskImage = renderer.render();
        }