Fix errors in buffer_marker tests

If srcAccessMask is VK_ACCESS_TRANSFER_WRITE_BIT the stage mask must be
VK_PIPELINE_STAGE_TRANSFER_BIT
If vkFreeDescriptors is called, the descriptor pool must have been
created with VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT

Components: Vulkan

VK-GL-CTS issue: 3984

Affected tests:
dEQP-VK.api.buffer_marker.*.default_mem.*

Change-Id: Iaec7d2a74f7d4084258206d4c96cc112c23e38f8

diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferMarkerTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferMarkerTests.cpp
index f502902..a0d0029 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiBufferMarkerTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiBufferMarkerTests.cpp
@@ -488,7 +488,7 @@ tcu::TestStatus bufferMarkerMemoryDep(Context& context, MemoryDepParams params)
                DescriptorPoolBuilder descriptorPoolBuilder;
 
                descriptorPoolBuilder.addType(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1u);
-               descriptorPool = descriptorPoolBuilder.build(vk, device, 0, 1u);
+               descriptorPool = descriptorPoolBuilder.build(vk, device, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u);
 
                DescriptorSetLayoutBuilder setLayoutBuilder;
 
@@ -891,7 +891,7 @@ tcu::TestStatus bufferMarkerMemoryDep(Context& context, MemoryDepParams params)
                {
                        vk.cmdWriteBufferMarkerAMD(*cmdBuffer, params.base.stage, *markerBuffer, sizeof(deUint32) * slot, value);
 
-                       writeStages |= params.base.stage;
+                       writeStages |= VK_PIPELINE_STAGE_TRANSFER_BIT;
                        writeAccess |= VK_ACCESS_TRANSFER_WRITE_BIT;
                }
                else