diff options
| author | Jon Ashburn <jon@lunarg.com> | 2014-10-17 15:31:22 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2014-10-29 18:01:59 -0600 |
| commit | ba8f3cce59eb1dd83f1649e1122d1980f8768dc3 (patch) | |
| tree | ce5a1585c8e447c3a08a2241daafd95d708b24e7 | |
| parent | 80d75878bafc753c979da68263b71e442c350b5c (diff) | |
| download | usermoji-ba8f3cce59eb1dd83f1649e1122d1980f8768dc3.tar.xz | |
Change GetProcAddr function signature to use XGL types.
Fix bug in GPA for basic_plugin.c .
| -rw-r--r-- | include/xgl.h | 2 | ||||
| -rw-r--r-- | include/xglLayer.h | 2 | ||||
| -rw-r--r-- | layers/basic_plugin.c | 4 | ||||
| -rw-r--r-- | loader/loader.c | 2 | ||||
| -rw-r--r-- | xgl.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/xgl.h b/include/xgl.h index b810c046..64734e10 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -1761,7 +1761,7 @@ typedef struct _XGL_DISPATCH_INDIRECT_CMD // ------------------------------------------------------------------------------------------------ // API functions -void * XGLAPI xglGetProcAddr( +XGL_VOID * XGLAPI xglGetProcAddr( XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName); diff --git a/include/xglLayer.h b/include/xglLayer.h index f139fff4..3295c8de 100644 --- a/include/xglLayer.h +++ b/include/xglLayer.h @@ -15,7 +15,7 @@ # define XGL_LAYER_EXPORT #endif -typedef void * (XGLAPI *GetProcAddrType)(XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName); +typedef XGL_VOID * (XGLAPI *GetProcAddrType)(XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName); typedef XGL_RESULT (XGLAPI *InitAndEnumerateGpusType)(const XGL_APPLICATION_INFO* pAppInfo, const XGL_ALLOC_CALLBACKS* pAllocCb, XGL_UINT maxGpus, XGL_UINT* pGpuCount, XGL_PHYSICAL_GPU* pGpus); typedef XGL_RESULT (XGLAPI *GetGpuInfoType)(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData); typedef XGL_RESULT (XGLAPI *CreateDeviceType)(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo, XGL_DEVICE* pDevice); diff --git a/layers/basic_plugin.c b/layers/basic_plugin.c index e0928c25..3807d493 100644 --- a/layers/basic_plugin.c +++ b/layers/basic_plugin.c @@ -168,7 +168,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMA return result; } -XGL_LAYER_EXPORT void * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pName) { +XGL_LAYER_EXPORT XGL_VOID * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pName) { XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu; if (gpu == NULL) return NULL; @@ -256,7 +256,7 @@ XGL_LAYER_EXPORT void * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CH return myTable.CreateQueryPool; else if (!strncmp("xglGetQueryPoolResults", (const char *) pName, sizeof ("xglGetQueryPoolResults"))) return myTable.GetQueryPoolResults; - else if (!strncmp("xglGetFormatInfo", (const char *) pName, sizeof ("xgllGetFormatInfo"))) + else if (!strncmp("xglGetFormatInfo", (const char *) pName, sizeof ("xglGetFormatInfo"))) return xglGetFormatInfo; else if (!strncmp("xglCreateImage", (const char *) pName, sizeof ("xglCreateImage"))) return myTable.CreateImage; diff --git a/loader/loader.c b/loader/loader.c index b5618731..04276008 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -739,7 +739,7 @@ LOADER_EXPORT XGL_RESULT xglSetLayers(const XGL_CHAR * pStr) #endif -LOADER_EXPORT void * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName) { +LOADER_EXPORT XGL_VOID * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName) { if (gpu == NULL) return NULL; @@ -87,7 +87,7 @@ class Proto(object): # XGL core API core = ( - Proto("void *", "GetProcAddr", + Proto("XGL_VOID *", "GetProcAddr", (Param("XGL_PHYSICAL_GPU", "gpu"), Param("const XGL_CHAR*", "pName"))), |