Merge branch 'jekstrand_renderpass_transfer_bit_fix' into 'master'

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

diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp
index 3cc253b..61a663f 100644 (file)
--- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp
+++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp
@@ -322,20 +322,20 @@ protected:
                viewport.minDepth = 0.0f;
                viewport.maxDepth = 1.0f;
 
-               m_vk.cmdSetViewport(*m_cmdBuffer, 1, &viewport);
+               m_vk.cmdSetViewport(*m_cmdBuffer, 0, 1, &viewport);
 
                vk::VkRect2D scissor;
                scissor.offset.x = 0;
                scissor.offset.y = 0;
                scissor.extent.width = width;
                scissor.extent.height = height;
-               m_vk.cmdSetScissor(*m_cmdBuffer, 1, &scissor);
+               m_vk.cmdSetScissor(*m_cmdBuffer, 0, 1, &scissor);
        }
 
        void setDynamicViewportState (const deUint32 viewportCount, const vk::VkViewport* pViewports, const vk::VkRect2D* pScissors)
        {
-               m_vk.cmdSetViewport(*m_cmdBuffer, viewportCount, pViewports);
-               m_vk.cmdSetScissor(*m_cmdBuffer, viewportCount, pScissors);
+               m_vk.cmdSetViewport(*m_cmdBuffer, 0, viewportCount, pViewports);
+               m_vk.cmdSetScissor(*m_cmdBuffer, 0, viewportCount, pScissors);
        }
 
        void setDynamicRasterizationState (const float lineWidth = 1.0f,
@@ -431,6 +431,7 @@ public:
                        DE_NULL,                                                        // const void*                          pNext;
                        0,                                                                      // deUint32                                     waitSemaphoreCount;
                        DE_NULL,                                                        // const VkSemaphore*           pWaitSemaphores;
+                       (const vk::VkPipelineStageFlags*)DE_NULL,
                        1,                                                                      // deUint32                                     commandBufferCount;
                        &m_cmdBuffer.get(),                                     // const VkCommandBuffer*       pCommandBuffers;
                        0,                                                                      // deUint32                                     signalSemaphoreCount;
@@ -536,6 +537,7 @@ public:
                        DE_NULL,                                                        // const void*                          pNext;
                        0,                                                                      // deUint32                                     waitSemaphoreCount;
                        DE_NULL,                                                        // const VkSemaphore*           pWaitSemaphores;
+                       (const vk::VkPipelineStageFlags*)DE_NULL,
                        1,                                                                      // deUint32                                     commandBufferCount;
                        &m_cmdBuffer.get(),                                     // const VkCommandBuffer*       pCommandBuffers;
                        0,                                                                      // deUint32                                     signalSemaphoreCount;
@@ -641,6 +643,7 @@ public:
                        DE_NULL,                                                        // const void*                          pNext;
                        0,                                                                      // deUint32                                     waitSemaphoreCount;
                        DE_NULL,                                                        // const VkSemaphore*           pWaitSemaphores;
+                       (const vk::VkPipelineStageFlags*)DE_NULL,
                        1,                                                                      // deUint32                                     commandBufferCount;
                        &m_cmdBuffer.get(),                                     // const VkCommandBuffer*       pCommandBuffers;
                        0,                                                                      // deUint32                                     signalSemaphoreCount;