commit 5eee57ac686b52725ac85b04b6ed1ca536ede375
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 2281ce30ce9b62138aa2e324134ae3ea326bad33
parent d43f9b6658a3cc2115fd9db118f6fd51acf09379

Fixes to Basic and Generic layers to work singly with LD_PRELOAD

xgl-generate.py

diff --git a/xgl-generate.py b/xgl-generate.py
index 6e790d8..552c84d 100755
--- a/xgl-generate.py
+++ b/xgl-generate.py
@@ -151,7 +151,7 @@
                              "    %s = wrapped_obj->nextObject;\n"
                              "    %s;\n"
                                  "}" % (qual, decl, proto.params[0].name, proto.params[0].name, stmt))
-            elif proto.name != "GetProcAddr":
+            elif proto.name != "GetProcAddr" and proto.name != "InitAndEnumerateGpus":
                 decl = proto.c_func(prefix="xgl", attr="XGLAPI")
                 param0_name = proto.params[0].name
                 ret_val = ''
@@ -194,8 +194,13 @@
         for name in xgl.icd_dispatch_table:
             if name == "GetProcAddr":
                 continue
-            func_body.append('    else if (!strncmp("%s%s", (const char *) funcName, sizeof("%s%s")))\n'
+            if name == "InitAndEnumerateGpus":
+                func_body.append('    else if (!strncmp("%s%s", (const char *) funcName, sizeof("%s%s")))\n'
+                             '        return nextTable.%s;' % (prefix, name, prefix, name, name))
+            else:
+                func_body.append('    else if (!strncmp("%s%s", (const char *) funcName, sizeof("%s%s")))\n'
                              '        return %s%s;' % (prefix, name, prefix, name, prefix, name))
+
         func_body.append("    else {\n"
                          "        XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;\n"
                          "        if (gpuw->pGPA == NULL)\n"