diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-01-09 15:12:03 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-02-04 17:58:05 -0700 |
| commit | c33e19116afd09976bdc39e48a6534f9465f3d38 (patch) | |
| tree | 1af4c6cf9e5e78805b1572b85b62b074e92d12a4 /layers/basic.cpp | |
| parent | 12c336ff1a82287b33587cab07db48a3d458d807 (diff) | |
| download | usermoji-c33e19116afd09976bdc39e48a6534f9465f3d38.tar.xz | |
xgl: Add xgl header changes for rev30 and 31.
Switched EnumerateLayer parameter order, added conditional definition
of xgl function prototypes, and prepended 'xgl' to all function
prototypes. This included fixes for bugs #13173 and #13180.
Diffstat (limited to 'layers/basic.cpp')
| -rw-r--r-- | layers/basic.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/layers/basic.cpp b/layers/basic.cpp index 9a71e615..5b2bb580 100644 --- a/layers/basic.cpp +++ b/layers/basic.cpp @@ -32,7 +32,7 @@ static std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *> tableMap; static XGL_LAYER_DISPATCH_TABLE * initLayerTable(const XGL_BASE_LAYER_OBJECT *gpuw) { - GetProcAddrType fpGPA; + xglGetProcAddrType fpGPA; XGL_LAYER_DISPATCH_TABLE *pTable; assert(gpuw); @@ -95,7 +95,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMA return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_CHAR* const* pOutLayers, XGL_SIZE * pOutLayerCount, XGL_VOID* pReserved) +XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers, XGL_VOID* pReserved) { if (gpu != NULL) { @@ -103,7 +103,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_ XGL_LAYER_DISPATCH_TABLE* pTable = initLayerTable(gpuw); printf("At start of wrapped xglEnumerateLayers() call w/ gpu: %p\n", gpu); - XGL_RESULT result = pTable->EnumerateLayers((XGL_PHYSICAL_GPU)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayers, pOutLayerCount, pReserved); + XGL_RESULT result = pTable->EnumerateLayers((XGL_PHYSICAL_GPU)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); return result; } else { @@ -112,10 +112,10 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_ // Example of a layer that is only compatible with Intel's GPUs XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT*) pReserved; - GetGpuInfoType fpGetGpuInfo; + xglGetGpuInfoType fpGetGpuInfo; XGL_PHYSICAL_GPU_PROPERTIES gpuProps; XGL_SIZE dataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES); - fpGetGpuInfo = (GetGpuInfoType) gpuw->pGPA((XGL_PHYSICAL_GPU) gpuw->nextObject, "xglGetGpuInfo"); + fpGetGpuInfo = (xglGetGpuInfoType) gpuw->pGPA((XGL_PHYSICAL_GPU) gpuw->nextObject, "xglGetGpuInfo"); fpGetGpuInfo((XGL_PHYSICAL_GPU) gpuw->nextObject, XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES, &dataSize, &gpuProps); if (gpuProps.vendorId == 0x8086) { |