From 967cbff8425d867596439a0c890d4b193e0f1273 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 25 Mar 2015 17:14:29 -0600 Subject: xgl: Rename XGL_QUEUE_SEMAPHORE to XGL_SEMAPHORE bug #13473 header: r29790 (0.63.0) --- icd/nulldrv/nulldrv.c | 20 ++++++++++---------- include/xgl.h | 50 ++++++++++++++++++++++++------------------------- include/xglDbg.h | 4 ++-- include/xglLayer.h | 8 ++++---- layers/glave_snapshot.c | 16 ++++++++-------- layers/object_track.h | 6 +++--- xgl-layer-generate.py | 2 +- xgl.py | 24 ++++++++++++------------ xgl_helper.py | 4 ++-- 9 files changed, 67 insertions(+), 67 deletions(-) diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index e7cad640..72be4599 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1728,35 +1728,35 @@ ICD_EXPORT XGL_RESULT XGLAPI xglQueueSubmit( return XGL_SUCCESS; } -ICD_EXPORT XGL_RESULT XGLAPI xglOpenSharedQueueSemaphore( +ICD_EXPORT XGL_RESULT XGLAPI xglOpenSharedSemaphore( XGL_DEVICE device, - const XGL_QUEUE_SEMAPHORE_OPEN_INFO* pOpenInfo, - XGL_QUEUE_SEMAPHORE* pSemaphore) + const XGL_SEMAPHORE_OPEN_INFO* pOpenInfo, + XGL_SEMAPHORE* pSemaphore) { NULLDRV_LOG_FUNC; return XGL_SUCCESS; } -ICD_EXPORT XGL_RESULT XGLAPI xglCreateQueueSemaphore( +ICD_EXPORT XGL_RESULT XGLAPI xglCreateSemaphore( XGL_DEVICE device, - const XGL_QUEUE_SEMAPHORE_CREATE_INFO* pCreateInfo, - XGL_QUEUE_SEMAPHORE* pSemaphore) + const XGL_SEMAPHORE_CREATE_INFO* pCreateInfo, + XGL_SEMAPHORE* pSemaphore) { NULLDRV_LOG_FUNC; return XGL_SUCCESS; } -ICD_EXPORT XGL_RESULT XGLAPI xglSignalQueueSemaphore( +ICD_EXPORT XGL_RESULT XGLAPI xglQueueSignalSemaphore( XGL_QUEUE queue, - XGL_QUEUE_SEMAPHORE semaphore) + XGL_SEMAPHORE semaphore) { NULLDRV_LOG_FUNC; return XGL_SUCCESS; } -ICD_EXPORT XGL_RESULT XGLAPI xglWaitQueueSemaphore( +ICD_EXPORT XGL_RESULT XGLAPI xglQueueWaitSemaphore( XGL_QUEUE queue, - XGL_QUEUE_SEMAPHORE semaphore) + XGL_SEMAPHORE semaphore) { NULLDRV_LOG_FUNC; return XGL_SUCCESS; diff --git a/include/xgl.h b/include/xgl.h index 7954643c..8e7aa161 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -33,7 +33,7 @@ #include "xglPlatform.h" // XGL API version supported by this file -#define XGL_API_VERSION XGL_MAKE_VERSION(0, 62, 1) +#define XGL_API_VERSION XGL_MAKE_VERSION(0, 63, 0) #ifdef __cplusplus extern "C" @@ -80,7 +80,7 @@ XGL_DEFINE_SUBCLASS_HANDLE(XGL_DYNAMIC_CB_STATE_OBJECT, XGL_DYNAMIC_STATE_OBJECT XGL_DEFINE_SUBCLASS_HANDLE(XGL_DYNAMIC_DS_STATE_OBJECT, XGL_DYNAMIC_STATE_OBJECT) XGL_DEFINE_SUBCLASS_HANDLE(XGL_CMD_BUFFER, XGL_OBJECT) XGL_DEFINE_SUBCLASS_HANDLE(XGL_FENCE, XGL_OBJECT) -XGL_DEFINE_SUBCLASS_HANDLE(XGL_QUEUE_SEMAPHORE, XGL_OBJECT) +XGL_DEFINE_SUBCLASS_HANDLE(XGL_SEMAPHORE, XGL_OBJECT) XGL_DEFINE_SUBCLASS_HANDLE(XGL_EVENT, XGL_OBJECT) XGL_DEFINE_SUBCLASS_HANDLE(XGL_QUERY_POOL, XGL_OBJECT) XGL_DEFINE_SUBCLASS_HANDLE(XGL_FRAMEBUFFER, XGL_OBJECT) @@ -1024,8 +1024,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_QUEUE_SEMAPHORE_CREATE_INFO = 23, - XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_OPEN_INFO = 24, + XGL_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO = 23, + XGL_STRUCTURE_TYPE_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, @@ -2163,20 +2163,20 @@ typedef struct _XGL_FENCE_CREATE_INFO XGL_FLAGS flags; // Reserved } XGL_FENCE_CREATE_INFO; -typedef struct _XGL_QUEUE_SEMAPHORE_CREATE_INFO +typedef struct _XGL_SEMAPHORE_CREATE_INFO { - XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_CREATE_INFO + XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO const void* pNext; // Pointer to next structure uint32_t initialCount; XGL_FLAGS flags; // XGL_SEMAPHORE_CREATE_FLAGS -} XGL_QUEUE_SEMAPHORE_CREATE_INFO; +} XGL_SEMAPHORE_CREATE_INFO; -typedef struct _XGL_QUEUE_SEMAPHORE_OPEN_INFO +typedef struct _XGL_SEMAPHORE_OPEN_INFO { - XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_OPEN_INFO + XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_SEMAPHORE_OPEN_INFO const void* pNext; // Pointer to next structure - XGL_QUEUE_SEMAPHORE sharedSemaphore; -} XGL_QUEUE_SEMAPHORE_OPEN_INFO; + XGL_SEMAPHORE sharedSemaphore; +} XGL_SEMAPHORE_OPEN_INFO; typedef struct _XGL_PIPELINE_STATISTICS_DATA { @@ -2264,7 +2264,7 @@ typedef XGL_RESULT (XGLAPI *xglUnmapMemoryType)(XGL_GPU_MEMORY mem); typedef XGL_RESULT (XGLAPI *xglPinSystemMemoryType)(XGL_DEVICE device, const void* pSysMem, size_t memSize, XGL_GPU_MEMORY* pMem); typedef XGL_RESULT (XGLAPI *xglGetMultiGpuCompatibilityType)(XGL_PHYSICAL_GPU gpu0, XGL_PHYSICAL_GPU gpu1, XGL_GPU_COMPATIBILITY_INFO* pInfo); typedef XGL_RESULT (XGLAPI *xglOpenSharedMemoryType)(XGL_DEVICE device, const XGL_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem); -typedef XGL_RESULT (XGLAPI *xglOpenSharedQueueSemaphoreType)(XGL_DEVICE device, const XGL_QUEUE_SEMAPHORE_OPEN_INFO* pOpenInfo, XGL_QUEUE_SEMAPHORE* pSemaphore); +typedef XGL_RESULT (XGLAPI *xglOpenSharedSemaphoreType)(XGL_DEVICE device, const XGL_SEMAPHORE_OPEN_INFO* pOpenInfo, XGL_SEMAPHORE* pSemaphore); typedef XGL_RESULT (XGLAPI *xglOpenPeerMemoryType)(XGL_DEVICE device, const XGL_PEER_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem); typedef XGL_RESULT (XGLAPI *xglOpenPeerImageType)(XGL_DEVICE device, const XGL_PEER_IMAGE_OPEN_INFO* pOpenInfo, XGL_IMAGE* pImage, XGL_GPU_MEMORY* pMem); typedef XGL_RESULT (XGLAPI *xglDestroyObjectType)(XGL_OBJECT object); @@ -2275,9 +2275,9 @@ typedef XGL_RESULT (XGLAPI *xglBindImageMemoryRangeType)(XGL_IMAGE image, uint32 typedef XGL_RESULT (XGLAPI *xglCreateFenceType)(XGL_DEVICE device, const XGL_FENCE_CREATE_INFO* pCreateInfo, XGL_FENCE* pFence); typedef XGL_RESULT (XGLAPI *xglGetFenceStatusType)(XGL_FENCE fence); typedef XGL_RESULT (XGLAPI *xglWaitForFencesType)(XGL_DEVICE device, uint32_t fenceCount, const XGL_FENCE* pFences, bool32_t waitAll, uint64_t timeout); -typedef XGL_RESULT (XGLAPI *xglCreateQueueSemaphoreType)(XGL_DEVICE device, const XGL_QUEUE_SEMAPHORE_CREATE_INFO* pCreateInfo, XGL_QUEUE_SEMAPHORE* pSemaphore); -typedef XGL_RESULT (XGLAPI *xglSignalQueueSemaphoreType)(XGL_QUEUE queue, XGL_QUEUE_SEMAPHORE semaphore); -typedef XGL_RESULT (XGLAPI *xglWaitQueueSemaphoreType)(XGL_QUEUE queue, XGL_QUEUE_SEMAPHORE semaphore); +typedef XGL_RESULT (XGLAPI *xglCreateSemaphoreType)(XGL_DEVICE device, const XGL_SEMAPHORE_CREATE_INFO* pCreateInfo, XGL_SEMAPHORE* pSemaphore); +typedef XGL_RESULT (XGLAPI *xglQueueSignalSemaphoreType)(XGL_QUEUE queue, XGL_SEMAPHORE semaphore); +typedef XGL_RESULT (XGLAPI *xglQueueWaitSemaphoreType)(XGL_QUEUE queue, XGL_SEMAPHORE semaphore); typedef XGL_RESULT (XGLAPI *xglCreateEventType)(XGL_DEVICE device, const XGL_EVENT_CREATE_INFO* pCreateInfo, XGL_EVENT* pEvent); typedef XGL_RESULT (XGLAPI *xglGetEventStatusType)(XGL_EVENT event); typedef XGL_RESULT (XGLAPI *xglSetEventType)(XGL_EVENT event); @@ -2475,10 +2475,10 @@ XGL_RESULT XGLAPI xglOpenSharedMemory( const XGL_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem); -XGL_RESULT XGLAPI xglOpenSharedQueueSemaphore( +XGL_RESULT XGLAPI xglOpenSharedSemaphore( XGL_DEVICE device, - const XGL_QUEUE_SEMAPHORE_OPEN_INFO* pOpenInfo, - XGL_QUEUE_SEMAPHORE* pSemaphore); + const XGL_SEMAPHORE_OPEN_INFO* pOpenInfo, + XGL_SEMAPHORE* pSemaphore); XGL_RESULT XGLAPI xglOpenPeerMemory( XGL_DEVICE device, @@ -2542,18 +2542,18 @@ XGL_RESULT XGLAPI xglWaitForFences( // Queue semaphore functions -XGL_RESULT XGLAPI xglCreateQueueSemaphore( +XGL_RESULT XGLAPI xglCreateSemaphore( XGL_DEVICE device, - const XGL_QUEUE_SEMAPHORE_CREATE_INFO* pCreateInfo, - XGL_QUEUE_SEMAPHORE* pSemaphore); + const XGL_SEMAPHORE_CREATE_INFO* pCreateInfo, + XGL_SEMAPHORE* pSemaphore); -XGL_RESULT XGLAPI xglSignalQueueSemaphore( +XGL_RESULT XGLAPI xglQueueSignalSemaphore( XGL_QUEUE queue, - XGL_QUEUE_SEMAPHORE semaphore); + XGL_SEMAPHORE semaphore); -XGL_RESULT XGLAPI xglWaitQueueSemaphore( +XGL_RESULT XGLAPI xglQueueWaitSemaphore( XGL_QUEUE queue, - XGL_QUEUE_SEMAPHORE semaphore); + XGL_SEMAPHORE semaphore); // Event functions diff --git a/include/xglDbg.h b/include/xglDbg.h index d589dbe3..be63828c 100644 --- a/include/xglDbg.h +++ b/include/xglDbg.h @@ -75,11 +75,11 @@ typedef enum _XGL_DBG_OBJECT_TYPE XGL_DBG_OBJECT_DEPTH_STENCIL_STATE = 0x11, XGL_DBG_OBJECT_CMD_BUFFER = 0x12, XGL_DBG_OBJECT_FENCE = 0x13, - XGL_DBG_OBJECT_QUEUE_SEMAPHORE = 0x14, + XGL_DBG_OBJECT_SEMAPHORE = 0x14, XGL_DBG_OBJECT_EVENT = 0x15, XGL_DBG_OBJECT_QUERY_POOL = 0x16, XGL_DBG_OBJECT_SHARED_GPU_MEMORY = 0x17, - XGL_DBG_OBJECT_SHARED_QUEUE_SEMAPHORE = 0x18, + XGL_DBG_OBJECT_SHARED_SEMAPHORE = 0x18, XGL_DBG_OBJECT_PEER_GPU_MEMORY = 0x19, XGL_DBG_OBJECT_PEER_IMAGE = 0x1a, XGL_DBG_OBJECT_PINNED_GPU_MEMORY = 0x1b, diff --git a/include/xglLayer.h b/include/xglLayer.h index 74eaa404..5a25ca0e 100644 --- a/include/xglLayer.h +++ b/include/xglLayer.h @@ -49,7 +49,7 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE xglPinSystemMemoryType PinSystemMemory; xglGetMultiGpuCompatibilityType GetMultiGpuCompatibility; xglOpenSharedMemoryType OpenSharedMemory; - xglOpenSharedQueueSemaphoreType OpenSharedQueueSemaphore; + xglOpenSharedSemaphoreType OpenSharedSemaphore; xglOpenPeerMemoryType OpenPeerMemory; xglOpenPeerImageType OpenPeerImage; xglDestroyObjectType DestroyObject; @@ -60,9 +60,9 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE xglCreateFenceType CreateFence; xglGetFenceStatusType GetFenceStatus; xglWaitForFencesType WaitForFences; - xglCreateQueueSemaphoreType CreateQueueSemaphore; - xglSignalQueueSemaphoreType SignalQueueSemaphore; - xglWaitQueueSemaphoreType WaitQueueSemaphore; + xglCreateSemaphoreType CreateSemaphore; + xglQueueSignalSemaphoreType QueueSignalSemaphore; + xglQueueWaitSemaphoreType QueueWaitSemaphore; xglCreateEventType CreateEvent; xglGetEventStatusType GetEventStatus; xglSetEventType SetEvent; diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c index c1b127a3..b80986b2 100644 --- a/layers/glave_snapshot.c +++ b/layers/glave_snapshot.c @@ -708,12 +708,12 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglOpenSharedMemory(XGL_DEVICE device, const return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglOpenSharedQueueSemaphore(XGL_DEVICE device, const XGL_QUEUE_SEMAPHORE_OPEN_INFO* pOpenInfo, XGL_QUEUE_SEMAPHORE* pSemaphore) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglOpenSharedSemaphore(XGL_DEVICE device, const XGL_SEMAPHORE_OPEN_INFO* pOpenInfo, XGL_SEMAPHORE* pSemaphore) { loader_platform_thread_lock_mutex(&objLock); ll_increment_use_count((void*)device, XGL_OBJECT_TYPE_DEVICE); loader_platform_thread_unlock_mutex(&objLock); - XGL_RESULT result = nextTable.OpenSharedQueueSemaphore(device, pOpenInfo, pSemaphore); + XGL_RESULT result = nextTable.OpenSharedSemaphore(device, pOpenInfo, pSemaphore); return result; } @@ -815,12 +815,12 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, uint32_t return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateQueueSemaphore(XGL_DEVICE device, const XGL_QUEUE_SEMAPHORE_CREATE_INFO* pCreateInfo, XGL_QUEUE_SEMAPHORE* pSemaphore) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateSemaphore(XGL_DEVICE device, const XGL_SEMAPHORE_CREATE_INFO* pCreateInfo, XGL_SEMAPHORE* pSemaphore) { loader_platform_thread_lock_mutex(&objLock); ll_increment_use_count((void*)device, XGL_OBJECT_TYPE_DEVICE); loader_platform_thread_unlock_mutex(&objLock); - XGL_RESULT result = nextTable.CreateQueueSemaphore(device, pCreateInfo, pSemaphore); + XGL_RESULT result = nextTable.CreateSemaphore(device, pCreateInfo, pSemaphore); if (result == XGL_SUCCESS) { loader_platform_thread_lock_mutex(&objLock); @@ -831,15 +831,15 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateQueueSemaphore(XGL_DEVICE device, co return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglSignalQueueSemaphore(XGL_QUEUE queue, XGL_QUEUE_SEMAPHORE semaphore) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSignalSemaphore(XGL_QUEUE queue, XGL_SEMAPHORE semaphore) { - XGL_RESULT result = nextTable.SignalQueueSemaphore(queue, semaphore); + XGL_RESULT result = nextTable.QueueSignalSemaphore(queue, semaphore); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitQueueSemaphore(XGL_QUEUE queue, XGL_QUEUE_SEMAPHORE semaphore) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueWaitSemaphore(XGL_QUEUE queue, XGL_SEMAPHORE semaphore) { - XGL_RESULT result = nextTable.WaitQueueSemaphore(queue, semaphore); + XGL_RESULT result = nextTable.QueueWaitSemaphore(queue, semaphore); return result; } diff --git a/layers/object_track.h b/layers/object_track.h index 9c224c5e..e9b3eb73 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -64,7 +64,7 @@ typedef enum _XGL_OBJECT_TYPE XGL_OBJECT_TYPE_DESCRIPTOR_REGION, XGL_OBJECT_TYPE_DYNAMIC_CB_STATE_OBJECT, XGL_OBJECT_TYPE_IMAGE_VIEW, - XGL_OBJECT_TYPE_QUEUE_SEMAPHORE, + XGL_OBJECT_TYPE_SEMAPHORE, XGL_OBJECT_TYPE_SHADER, XGL_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, XGL_OBJECT_TYPE_BUFFER, @@ -113,8 +113,8 @@ static const char* string_XGL_OBJECT_TYPE(XGL_OBJECT_TYPE type) { return "IMAGE"; case XGL_OBJECT_TYPE_CMD_BUFFER: return "CMD_BUFFER"; - case XGL_OBJECT_TYPE_QUEUE_SEMAPHORE: - return "QUEUE_SEMAPHORE"; + case XGL_OBJECT_TYPE_SEMAPHORE: + return "SEMAPHORE"; case XGL_OBJECT_TYPE_FRAMEBUFFER: return "FRAMEBUFFER"; case XGL_OBJECT_TYPE_SAMPLER: diff --git a/xgl-layer-generate.py b/xgl-layer-generate.py index 98a62cef..33b1683b 100755 --- a/xgl-layer-generate.py +++ b/xgl-layer-generate.py @@ -630,7 +630,7 @@ class Subcommand(object): using_line += ' g_debugAction &= ~XGL_DBG_LAYER_ACTION_CALLBACK;\n' using_line += ' }\n' # Special cases for API funcs that don't use an object as first arg - elif True in [no_use_proto in proto.name for no_use_proto in ['GlobalOption', 'CreateInstance', 'QueueSubmit', 'QueueSetGlobalMemReferences', 'QueueWaitIdle', 'CreateDevice', 'GetGpuInfo', 'SignalQueueSemaphore', 'WaitQueueSemaphore', 'WsiX11QueuePresent']]: + elif True in [no_use_proto in proto.name for no_use_proto in ['GlobalOption', 'CreateInstance', 'QueueSubmit', 'QueueSetGlobalMemReferences', 'QueueWaitIdle', 'CreateDevice', 'GetGpuInfo', 'QueueSignalSemaphore', 'QueueWaitSemaphore', 'WsiX11QueuePresent']]: using_line = '' else: using_line = ' loader_platform_thread_lock_mutex(&objLock);\n' diff --git a/xgl.py b/xgl.py index c5988ee8..b150b17c 100644 --- a/xgl.py +++ b/xgl.py @@ -209,7 +209,7 @@ core = Extension( "XGL_DYNAMIC_DS_STATE_OBJECT", "XGL_CMD_BUFFER", "XGL_FENCE", - "XGL_QUEUE_SEMAPHORE", + "XGL_SEMAPHORE", "XGL_EVENT", "XGL_QUERY_POOL", "XGL_FRAMEBUFFER", @@ -321,10 +321,10 @@ core = Extension( Param("const XGL_MEMORY_OPEN_INFO*", "pOpenInfo"), Param("XGL_GPU_MEMORY*", "pMem")]), - Proto("XGL_RESULT", "OpenSharedQueueSemaphore", + Proto("XGL_RESULT", "OpenSharedSemaphore", [Param("XGL_DEVICE", "device"), - Param("const XGL_QUEUE_SEMAPHORE_OPEN_INFO*", "pOpenInfo"), - Param("XGL_QUEUE_SEMAPHORE*", "pSemaphore")]), + Param("const XGL_SEMAPHORE_OPEN_INFO*", "pOpenInfo"), + Param("XGL_SEMAPHORE*", "pSemaphore")]), Proto("XGL_RESULT", "OpenPeerMemory", [Param("XGL_DEVICE", "device"), @@ -382,18 +382,18 @@ core = Extension( Param("bool32_t", "waitAll"), Param("uint64_t", "timeout")]), - Proto("XGL_RESULT", "CreateQueueSemaphore", + Proto("XGL_RESULT", "CreateSemaphore", [Param("XGL_DEVICE", "device"), - Param("const XGL_QUEUE_SEMAPHORE_CREATE_INFO*", "pCreateInfo"), - Param("XGL_QUEUE_SEMAPHORE*", "pSemaphore")]), + Param("const XGL_SEMAPHORE_CREATE_INFO*", "pCreateInfo"), + Param("XGL_SEMAPHORE*", "pSemaphore")]), - Proto("XGL_RESULT", "SignalQueueSemaphore", + Proto("XGL_RESULT", "QueueSignalSemaphore", [Param("XGL_QUEUE", "queue"), - Param("XGL_QUEUE_SEMAPHORE", "semaphore")]), + Param("XGL_SEMAPHORE", "semaphore")]), - Proto("XGL_RESULT", "WaitQueueSemaphore", + Proto("XGL_RESULT", "QueueWaitSemaphore", [Param("XGL_QUEUE", "queue"), - Param("XGL_QUEUE_SEMAPHORE", "semaphore")]), + Param("XGL_SEMAPHORE", "semaphore")]), Proto("XGL_RESULT", "CreateEvent", [Param("XGL_DEVICE", "device"), @@ -928,7 +928,7 @@ object_list = [ "XGL_DYNAMIC_STATE_OBJECT", "XGL_CMD_BUFFER", "XGL_FENCE", - "XGL_QUEUE_SEMAPHORE", + "XGL_SEMAPHORE", "XGL_EVENT", "XGL_QUERY_POOL", "XGL_FRAMEBUFFER", diff --git a/xgl_helper.py b/xgl_helper.py index 14f19023..9a52e339 100755 --- a/xgl_helper.py +++ b/xgl_helper.py @@ -1502,10 +1502,10 @@ class GraphVizGen: #if 'XGL_PIPELINE_CB_STATE_CREATE_INFO' in struct_name: # struct_name = 'XGL_PIPELINE_CB_STATE' if 'XGL_SEMAPHORE_CREATE_INFO' in struct_name: - struct_name = 'XGL_QUEUE_SEMAPHORE_CREATE_INFO' + struct_name = 'XGL_SEMAPHORE_CREATE_INFO' print_func_name = self._get_gv_func_name(struct_name) elif 'XGL_SEMAPHORE_OPEN_INFO' in struct_name: - struct_name = 'XGL_QUEUE_SEMAPHORE_OPEN_INFO' + struct_name = 'XGL_SEMAPHORE_OPEN_INFO' print_func_name = self._get_gv_func_name(struct_name) gv_funcs.append(' case %s:\n' % (v)) gv_funcs.append(' return %s((%s*)pStruct, nodeName);\n' % (print_func_name, struct_name)) -- cgit v1.2.3