commit 1e8f3beb87a11fb56f0f4be7f75bec85a387aa0d
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Mar 24 18:02:34 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:25 2015 +0800
tree 6075a92406ac861888e3c8f6045131eb995f2707
parent 3c3987cb1c6a914166bbb65dc713ad6b7410ad04

xgl: Add XGL_PIPE_EVENT to CmdResetEvent

part 3 of bug #12904
alpha header: r29684 (0.59.0)

(3) Where does xglCmdResetEvent update the event's status? Unlike xglCmdSetEvent this function doesn't take a parameter specifying this.

- Added pipeEvent parameter also to xglCmdResetEvent. Also renamed XGL_SET_EVENT to XGL_PIPE_EVENT as now it's no longer used only for set operations.

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 2371e11..e13c8f0 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -822,7 +822,7 @@
             XGL_MEMORY_OUTPUT_COPY_BIT, XGL_MEMORY_INPUT_COPY_BIT, 0, 4);
     XGL_BUFFER_MEMORY_BARRIER *pmemory_barrier = &memory_barrier;
 
-    XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_TRANSFER_COMPLETE };
+    XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_TRANSFER_COMPLETE };
     XGL_PIPELINE_BARRIER pipeline_barrier = {};
     pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
     pipeline_barrier.eventCount = 1;
@@ -852,7 +852,7 @@
     /* Use xglCmdSetEvent and xglCmdWaitEvents to test them.
      * This could be xglCmdPipelineBarrier.
      */
-    xglCmdSetEvent(cmd_.obj(), event, XGL_SET_EVENT_TRANSFER_COMPLETE);
+    xglCmdSetEvent(cmd_.obj(), event, XGL_PIPE_EVENT_TRANSFER_COMPLETE);
 
     // Additional commands could go into the buffer here before the wait.
 
@@ -1384,7 +1384,7 @@
 
         cmd_.begin();
 
-        XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+        XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_GPU_COMMANDS_COMPLETE };
         XGL_PIPELINE_BARRIER pipeline_barrier = {};
         pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
         pipeline_barrier.eventCount = 1;
@@ -1613,7 +1613,7 @@
 
         cmd_.begin();
 
-        XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+        XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_GPU_COMMANDS_COMPLETE };
         XGL_PIPELINE_BARRIER pipeline_barrier = {};
         pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
         pipeline_barrier.eventCount = 1;

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index 3721816..4083b02 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -523,7 +523,7 @@
 
     XGL_IMAGE_MEMORY_BARRIER *pmemory_barrier = &image_memory_barrier;
 
-    XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+    XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_GPU_COMMANDS_COMPLETE };
     XGL_PIPELINE_BARRIER pipeline_barrier;
     pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
     pipeline_barrier.pNext = NULL;
@@ -741,7 +741,7 @@
         buffer_memory_barrier(outputMask, inputMask, 0, m_numVertices * m_stride);
     XGL_BUFFER_MEMORY_BARRIER *pmemory_barrier = &memory_barrier;
 
-    XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+    XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_GPU_COMMANDS_COMPLETE };
     XGL_PIPELINE_BARRIER pipeline_barrier = {};
     pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
     pipeline_barrier.eventCount = 1;
@@ -1184,7 +1184,7 @@
     memory_barrier.subresourceRange = srRange;
     XGL_IMAGE_MEMORY_BARRIER *pmemory_barrier = &memory_barrier;
 
-    XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+    XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_GPU_COMMANDS_COMPLETE };
     XGL_PIPELINE_BARRIER pipeline_barrier = {};
     pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
     pipeline_barrier.eventCount = 1;
@@ -1270,7 +1270,7 @@
     memory_barrier.subresourceRange = srRange;
     XGL_IMAGE_MEMORY_BARRIER *pmemory_barrier = &memory_barrier;
 
-    XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+    XGL_PIPE_EVENT set_events[] = { XGL_PIPE_EVENT_GPU_COMMANDS_COMPLETE };
     XGL_PIPELINE_BARRIER pipeline_barrier = {};
     pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
     pipeline_barrier.eventCount = 1;