commit 613b0c1f0f778fd9ec32f7202090093ddadbde82
author Jon Ashburn <jon@lunarg.com> Mon Nov 17 10:17:37 2014 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Nov 26 10:03:12 2014 -0700
tree 4807f1ebe6963949738af0a1d42e06672aa5085a
parent db20d60e30bb491f7a2223f8f0321d7d1013ef0e

loader: Change ActivateLayers name to be consistent with rest of loader

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index 5ee32b0..bb4d949 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -753,7 +753,7 @@
     }
 }
 
-extern XGL_UINT ActivateLayers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo)
+extern XGL_UINT loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo)
 {
     XGL_UINT gpu_index;
     XGL_UINT count;

loader/loader.h

diff --git a/loader/loader.h b/loader/loader.h
index e2c1ade..ac8cfc1 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -40,6 +40,6 @@
 #  define LOADER_EXPORT
 #endif
 
-extern XGL_UINT ActivateLayers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo);
+extern XGL_UINT loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo);
 #define MAX_LAYER_LIBRARIES 64
 #endif /* LOADER_H */

xgl-generate.py

diff --git a/xgl-generate.py b/xgl-generate.py
index 9f58dd3..56873a4 100755
--- a/xgl-generate.py
+++ b/xgl-generate.py
@@ -123,7 +123,7 @@
             if proto.name == "CreateDevice" and qual == "LOADER_EXPORT ":
                 funcs.append("%s%s\n"
                          "{\n"
-                         "    ActivateLayers(%s, %s);\n"
+                         "    loader_activate_layers(%s, %s);\n"
                          "    XGL_BASE_LAYER_OBJECT* wrapped_obj = (XGL_BASE_LAYER_OBJECT*)%s;\n"
                          "    const XGL_LAYER_DISPATCH_TABLE * const *disp =\n"
                          "            (const XGL_LAYER_DISPATCH_TABLE * const *) wrapped_obj->baseObject;\n"