Fix submit semaphores in VK_Resource_Usage test

Fix validation layer errors

Author: Zorro666

util/test/demos/vk/vk_resource_usage.cpp

@@ -673,6 +673,7 @@ RD_TEST(VK_Resource_Usage, VulkanGraphicsTest)
     setName(barrierCmd, "Barrier Command Buffer");
     vkBeginCommandBuffer(barrierCmd,
                          vkh::CommandBufferBeginInfo(VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT));
+    setMarker(barrierCmd, "Multiple Command Buffer Submits");
     vkh::cmdPipelineBarrier(
         barrierCmd, {},
         {vkh::BufferMemoryBarrier(VK_ACCESS_NONE, VK_ACCESS_NONE, barrierBuffer.buffer)});
@@ -1208,7 +1209,7 @@ RD_TEST(VK_Resource_Usage, VulkanGraphicsTest)
 
       vkEndCommandBuffer(cmd);
 
-      Submit(0, 1, {cmd});
+      Submit(0, 3, {cmd});
 
       cmd = GetCommandBuffer();
 
@@ -1280,15 +1281,13 @@ RD_TEST(VK_Resource_Usage, VulkanGraphicsTest)
 
       vkEndCommandBuffer(cmd);
 
-      Submit(0, 1, {cmd});
+      Submit(1, 3, {cmd});
 
       std::vector<VkCommandBuffer> cmds;
       cmds.push_back(barrierCmd);
       VkSubmitInfo submit = vkh::SubmitInfo(cmds);
       for(uint32_t i = 0; i < 10; ++i)
       {
-        if(i == 0)
-          setMarker(cmd, "Multiple Command Buffer Submits");
         vkWaitForFences(device, 1, &barrerCmdSubmitFence, VK_TRUE, UINT64_MAX);
         vkResetFences(device, 1, &barrerCmdSubmitFence);
         CHECK_VKR(vkQueueSubmit(queue, 1, &submit, barrerCmdSubmitFence));
@@ -1310,7 +1309,7 @@ RD_TEST(VK_Resource_Usage, VulkanGraphicsTest)
 
       vkEndCommandBuffer(cmd);
 
-      Submit(0, 1, {cmd});
+      Submit(2, 3, {cmd});
 
       Present();
     }

util/test/tests/Vulkan/VK_Resource_Usage.py

@@ -269,21 +269,21 @@ def check_capture(self):
                             expectedUsage += [
                                         (255+countDrawIndirectCount,rd.ResourceUsage.Barrier)]
                     if (res.name == "Barrier Buffer"):
-                        expectedUsage = [(228+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (235+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (242+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (249+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (256+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (263+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (270+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                        expectedUsage = [(229+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (237+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (245+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (253+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (261+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (269+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
                                         (277+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (284+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (291+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier)]
+                                        (285+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (293+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (301+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier)]
                     if (res.name == "Barrier2 Buffer"):
-                        expectedUsage = [(299+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (304+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (309+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
-                                        (314+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier)]
+                        expectedUsage = [(309+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (314+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (319+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier),
+                                        (324+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Barrier)]
                 elif res.type == rd.ResourceType.Texture:
                     if (res.name == "Offscreen MSAA Image"):
                         expectedUsage = [(11,rd.ResourceUsage.Barrier),