From 4d4d071ade88d239ed50a290cf4f28cfc5d6869e Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 26 Jan 2015 10:34:00 -0600 Subject: [PATCH] xgl: Rename semaphore enums Cosmetic xgl header change for xgl.h revision #40. --- include/xgl.h | 8 ++++---- layers/draw_state.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 @@ typedef enum _XGL_STRUCTURE_TYPE 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_FENCE_CREATE_INFO 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_CREATE_INFO 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; 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 @@ static XGL_SIZE sTypeStructSize(XGL_STRUCTURE_TYPE sType) 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); -- 2.7.4