Validation fix dEQP-VK.binding_model

- Add srcStageMask to barriers

(cherry picked from commit f2e4f11a0803db89f7c7d8f9a9038a79e27a65ea)

diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
index bf157b1357e7f28a261b2d73ca4b427b449a9c97..f99721470a2060e3254c75d926148889a75e657c 100644 (file)
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
@@ -1782,7 +1782,7 @@ void ComputeCommand::submitAndWait (deUint32 queueFamilyIndex, vk::VkQueue queue
        m_vki.cmdBindDescriptorSets(*cmd, vk::VK_PIPELINE_BIND_POINT_COMPUTE, m_pipelineLayout, 0, m_numDescriptorSets, m_descriptorSets, m_numDynamicOffsets, m_dynamicOffsets);
 
        if (m_numPreBarriers)
-               m_vki.cmdPipelineBarrier(*cmd, 0u, vk::VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, (vk::VkDependencyFlags)0,
+               m_vki.cmdPipelineBarrier(*cmd, vk::VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, vk::VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, (vk::VkDependencyFlags)0,
                                                                 0, (const vk::VkMemoryBarrier*)DE_NULL,
                                                                 m_numPreBarriers, m_preBarriers,
                                                                 0, (const vk::VkImageMemoryBarrier*)DE_NULL);
@@ -3116,7 +3116,7 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface&         vki,
 
        // record command buffer
        VK_CHECK(vki.beginCommandBuffer(*cmd, &cmdBufBeginInfo));
-       vki.cmdPipelineBarrier(*cmd, 0u, vk::VK_PIPELINE_STAGE_TRANSFER_BIT, (vk::VkDependencyFlags)0,
+       vki.cmdPipelineBarrier(*cmd, vk::VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, vk::VK_PIPELINE_STAGE_TRANSFER_BIT, (vk::VkDependencyFlags)0,
                                                   0, (const vk::VkMemoryBarrier*)DE_NULL,
                                                   1, &preMemoryBarrier,
                                                   1, &preImageBarrier);