Fix resetting command buffer in ray tracing tests

VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT must be set to reset
command buffer and add missing reset

Components: Vulkan

VK-GL-CTS issue: 3960

Affected tests:
dEQP-VK.ray_tracing_pipeline.acceleration_structures.*

Change-Id: Icc5029fc796bff7cf095cbb78832483463cdaaaa

diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingAccelerationStructuresTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingAccelerationStructuresTests.cpp
index db49077..5862bd5 100644 (file)
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingAccelerationStructuresTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingAccelerationStructuresTests.cpp
@@ -2773,7 +2773,7 @@ tcu::TestStatus RayTracingHeaderBottomAddressTestInstance::iterate (void)
        const VkQueue                                                                           queue                   = m_context.getUniversalQueue();
        Allocator&                                                                                      allocator               = m_context.getDefaultAllocator();
 
-       const Move<VkCommandPool>                                                       cmdPool                 = createCommandPool(vkd, device, 0, familyIndex);
+       const Move<VkCommandPool>                                                       cmdPool                 = createCommandPool(vkd, device, vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, familyIndex);
        const Move<VkCommandBuffer>                                                     cmdBuffer               = allocateCommandBuffer(vkd, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
 
        beginCommandBuffer(vkd, *cmdBuffer, 0);
@@ -2790,6 +2790,7 @@ tcu::TestStatus RayTracingHeaderBottomAddressTestInstance::iterate (void)
        SerialStorage                                                                           deepStorage             (vkd, device, allocator, m_params->buildType, serialInfo);
 
        // make deep serialization - top-level AS width bottom-level structures that it owns
+       vkd.resetCommandBuffer(*cmdBuffer, 0);
        beginCommandBuffer(vkd, *cmdBuffer, 0);
        src->serialize(vkd, device, *cmdBuffer, &deepStorage);
        endCommandBuffer(vkd, *cmdBuffer);