commit 57f61ddae613178f319ea79d1570e205dbbf7f57
author Jon Ashburn <jon@lunarg.com> Wed Oct 15 12:08:33 2014 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Oct 29 18:01:58 2014 -0600
tree 4edc74d87fd2732a5eb1309835114c5cebfa6675
parent d38bfb1170a247a5b0343f62e7888a736b0c525f

Fixes to Basic and Generic layers to work singly with LD_PRELOAD

layers/basic_plugin.c

diff --git a/layers/basic_plugin.c b/layers/basic_plugin.c
index 32ada03..c13aace 100644
--- a/layers/basic_plugin.c
+++ b/layers/basic_plugin.c
@@ -14,12 +14,8 @@
 {
     GetProcAddrType fpGPA;
 
-    //memset(&myTable, 0 , sizeof(myTable));
-
-    //todo init the entire table to next entrypoint
     fpGPA = pCurObj->pGPA;
     assert(fpGPA);
-    // Layer
     myTable.GetProcAddr = fpGPA;
     myTable.InitAndEnumerateGpus = fpGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (const XGL_CHAR *) "xglInitAndEnumerateGpus");
     myTable.GetGpuInfo = fpGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (const XGL_CHAR *) "xglGetGpuInfo");
@@ -139,25 +135,17 @@
     myTable.WsiX11GetMSC = fpGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (const XGL_CHAR *) "xglWsiX11GetMSC");
     myTable.WsiX11CreatePresentableImage = fpGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (const XGL_CHAR *) "xglWsiX11CreatePresentableImage");
     myTable.WsiX11QueuePresent = fpGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (const XGL_CHAR *) "xglWsiX11QueuePresent");
-#if 0
-    fpNextCD = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (XGL_CHAR *) "xglCreateDevice");
-    myTable.CreateDevice = fpNextCD;
-    fpNextGGI = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (XGL_CHAR *) "xglGetGpuInfo");
-    myTable.GetGpuInfo = fpNextGGI;
-    fpNextGFI = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (XGL_CHAR *) "xglGetFormatInfo");
-    myTable.GetFormatInfo = fpNextGFI;
-#endif
     return;
 }
 
 XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetGpuInfo(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
 {
     XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
-    printf("At start of wrapped xglCreateDevice() call w/ gpu: %p\n", (void*)gpu);
+    printf("At start of wrapped xglGetGpuInfo() call w/ gpu: %p\n", (void*)gpu);
     pCurObj = gpuw;
     pthread_once(&tabOnce, initLayerTable);
     XGL_RESULT result = myTable.GetGpuInfo((XGL_PHYSICAL_GPU)gpuw->nextObject, infoType, pDataSize, pData);
-    printf("Completed wrapped xglCreateDevice() call w/ gpu: %p\n", (void*)gpu);
+    printf("Completed wrapped xglGetGpuInfo() call w/ gpu: %p\n", (void*)gpu);
     return result;
 }