Change GetProcAddr function signature to use XGL types.
Fix bug in GPA for basic_plugin.c .
diff --git a/include/xgl.h b/include/xgl.h
index b810c04..64734e1 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -1761,7 +1761,7 @@
// ------------------------------------------------------------------------------------------------
// 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 f139fff..3295c8d 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 e0928c2..3807d49 100644
--- a/layers/basic_plugin.c
+++ b/layers/basic_plugin.c
@@ -168,7 +168,7 @@
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 @@
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 b561873..0427600 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -739,7 +739,7 @@
#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;
diff --git a/xgl.py b/xgl.py
index dbdd063..857eea7 100644
--- a/xgl.py
+++ b/xgl.py
@@ -87,7 +87,7 @@
# XGL core API
core = (
- Proto("void *", "GetProcAddr",
+ Proto("XGL_VOID *", "GetProcAddr",
(Param("XGL_PHYSICAL_GPU", "gpu"),
Param("const XGL_CHAR*", "pName"))),