commit 8205d901f17b1c76d89c956be235cf4e7a20a546
author Tony Barbour <tony@LunarG.com> Thu Apr 16 15:59:00 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Apr 16 19:34:59 2015 -0600
tree b61bc0efb64f6fb76676dbc2629fd08eef00a871
parent 07b309a0cdfca1532ad14038682716ea7f77538d

Bug 13632 Header 84 Assorted questions and comments on vulkan.h

icd/intel/cmd_barrier.c

diff --git a/icd/intel/cmd_barrier.c b/icd/intel/cmd_barrier.c
index 93f7d33..e87fcea 100644
--- a/icd/intel/cmd_barrier.c
+++ b/icd/intel/cmd_barrier.c
@@ -271,8 +271,12 @@
 }
 
 ICD_EXPORT void VKAPI vkCmdWaitEvents(
-    VkCmdBuffer                              cmdBuffer,
-    const VkEventWaitInfo*                  pWaitInfo)
+    VkCmdBuffer                                 cmdBuffer,
+    VkWaitEvent                                 waitEvent,
+    uint32_t                                    eventCount,
+    const VkEvent*                              pEvents,
+    uint32_t                                    memBarrierCount,
+    const void**                                ppMemBarriers)
 {
     struct intel_cmd *cmd = intel_cmd(cmdBuffer);
 
@@ -290,12 +294,16 @@
      */
     cmd_memory_barriers(cmd,
             GEN6_PIPE_CONTROL_CS_STALL,
-            pWaitInfo->memBarrierCount, pWaitInfo->ppMemBarriers);
+            memBarrierCount, ppMemBarriers);
 }
 
 ICD_EXPORT void VKAPI vkCmdPipelineBarrier(
-    VkCmdBuffer                              cmdBuffer,
-    const VkPipelineBarrier*                 pBarrier)
+        VkCmdBuffer                                 cmdBuffer,
+        VkWaitEvent                                 waitEvent,
+        uint32_t                                    pipeEventCount,
+        const VkPipeEvent*                          pPipeEvents,
+        uint32_t                                    memBarrierCount,
+        const void**                                ppMemBarriers)
 {
     struct intel_cmd *cmd = intel_cmd(cmdBuffer);
     uint32_t pipe_control_flags = 0;
@@ -308,10 +316,10 @@
 
     /* Cache control is done with PIPE_CONTROL flags.
      * With no GEN6_PIPE_CONTROL_CS_STALL flag set, it behaves as VK_PIPE_EVENT_TOP_OF_PIPE.
-     * All other pEvents values will behave as VK_PIPE_EVENT_GPU_COMMANDS_COMPLETE.
+     * All other pEvents values will behave as VK_PIPE_EVENT_COMMANDS_COMPLETE.
      */
-    for (i = 0; i < pBarrier->eventCount; i++) {
-        switch(pBarrier->pEvents[i])
+    for (i = 0; i < pipeEventCount; i++) {
+        switch(pPipeEvents[i])
         {
         case VK_PIPE_EVENT_TOP_OF_PIPE:
             break;
@@ -321,7 +329,7 @@
         case VK_PIPE_EVENT_GRAPHICS_PIPELINE_COMPLETE:
         case VK_PIPE_EVENT_COMPUTE_PIPELINE_COMPLETE:
         case VK_PIPE_EVENT_TRANSFER_COMPLETE:
-        case VK_PIPE_EVENT_GPU_COMMANDS_COMPLETE:
+        case VK_PIPE_EVENT_COMMANDS_COMPLETE:
             pipe_control_flags |= GEN6_PIPE_CONTROL_CS_STALL;
             break;
         default:
@@ -336,5 +344,5 @@
      */
     cmd_memory_barriers(cmd,
             pipe_control_flags,
-            pBarrier->memBarrierCount, pBarrier->ppMemBarriers);
+            memBarrierCount, ppMemBarriers);
 }