commit 4eca69708cc080e1e6651b5797ad1e0d98080c0c
author Mark Lobodzinski <mark@lunarg.com> Mon Jan 26 10:34:00 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:09 2015 -0700
tree 5d1a228c891e252457898d20b4c2b99bcd9388d4
parent 661c329a5d6501bcd878e76a10802891f82d79c6

xgl:  Rename semaphore enums

Cosmetic xgl header change for xgl.h revision #40.

include/xgl.h

diff --git a/include/xgl.h b/include/xgl.h
index a9aa3cb..46a8018 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -921,8 +921,8 @@
     XGL_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO               = 20,
     XGL_STRUCTURE_TYPE_EVENT_CREATE_INFO                    = 21,
     XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO                    = 22,
-    XGL_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO                = 23,
-    XGL_STRUCTURE_TYPE_SEMAPHORE_OPEN_INFO                  = 24,
+    XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_CREATE_INFO          = 23,
+    XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_OPEN_INFO            = 24,
     XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO               = 25,
     XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO    = 26,
     XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO        = 27,
@@ -2023,7 +2023,7 @@
 
 typedef struct _XGL_QUEUE_SEMAPHORE_CREATE_INFO
 {
-    XGL_STRUCTURE_TYPE                      sType;      // Must be XGL_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO
+    XGL_STRUCTURE_TYPE                      sType;      // Must be XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_CREATE_INFO
     const XGL_VOID*                         pNext;      // Pointer to next structure
     XGL_UINT                                initialCount;
     XGL_FLAGS                               flags;      // XGL_SEMAPHORE_CREATE_FLAGS
@@ -2031,7 +2031,7 @@
 
 typedef struct _XGL_QUEUE_SEMAPHORE_OPEN_INFO
 {
-    XGL_STRUCTURE_TYPE                      sType;      // Must be XGL_STRUCTURE_TYPE_SEMAPHORE_OPEN_INFO
+    XGL_STRUCTURE_TYPE                      sType;      // Must be XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_OPEN_INFO
     const XGL_VOID*                         pNext;      // Pointer to next structure
     XGL_QUEUE_SEMAPHORE                     sharedSemaphore;
 } XGL_QUEUE_SEMAPHORE_OPEN_INFO;

layers/draw_state.c

diff --git a/layers/draw_state.c b/layers/draw_state.c
index b871de4..8ce0968 100644
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -156,9 +156,9 @@
             return sizeof(XGL_EVENT_CREATE_INFO);
         case XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO:
             return sizeof(XGL_FENCE_CREATE_INFO);
-        case XGL_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO:
+        case XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_CREATE_INFO:
             return sizeof(XGL_QUEUE_SEMAPHORE_CREATE_INFO);
-        case XGL_STRUCTURE_TYPE_SEMAPHORE_OPEN_INFO:
+        case XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_OPEN_INFO:
             return sizeof(XGL_QUEUE_SEMAPHORE_OPEN_INFO);
         case XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO:
             return sizeof(XGL_QUERY_POOL_CREATE_INFO);

tests/xgltestbinding.h

diff --git a/tests/xgltestbinding.h b/tests/xgltestbinding.h
index 20280b3..e8cd76a 100644
--- a/tests/xgltestbinding.h
+++ b/tests/xgltestbinding.h
@@ -652,7 +652,7 @@
 inline XGL_QUEUE_SEMAPHORE_CREATE_INFO QueueSemaphore::create_info(uint32_t init_count, XGL_FLAGS flags)
 {
     XGL_QUEUE_SEMAPHORE_CREATE_INFO info = {};
-    info.sType = XGL_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+    info.sType = XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_CREATE_INFO;
     info.initialCount = init_count;
     info.flags = flags;
     return info;