loader: Windows now uses registry + env's (diff names)

The loader on Windows now looks in the Windows Registry + in environment
variables for the following (Note the new names--"LIB" was dropped):

- XGL_DRIVERS_PATH
- XGL_LAYERS_PATH
- XGL_LAYER_NAMES

Linux still retains the "LIB" at the start of the environment variable names.

If both are used, they are concatenated into a semi-colon-delimited list.

A generic loader_get_registry_and_env() func is used to perform this (only for
Windows, since Linux doesn't have a registry).

1 files changed, 9 insertions, 0 deletions

diff --git a/loader/loader_platform.h b/loader/loader_platform.h
index dc0fa5ca..9686b65d 100644
--- a/loader/loader_platform.h
+++ b/loader/loader_platform.h
@@ -45,6 +45,9 @@
 // XGL Library Filenames, Paths, etc.:
 #define PATH_SEPERATOR ':'
 #define DIRECTORY_SYMBOL "/"
+#define DRIVER_PATH_ENV "LIBXGL_DRIVERS_PATH"
+#define LAYERS_PATH_ENV "LIBXGL_LAYERS_PATH"
+#define LAYER_NAMES_ENV "LIBXGL_LAYER_NAMES"
 #ifndef DEFAULT_XGL_DRIVERS_PATH
 // TODO: Is this a good default location?
 // Need to search for both 32bit and 64bit ICDs
@@ -146,6 +149,12 @@ using namespace std;
 // XGL Library Filenames, Paths, etc.:
 #define PATH_SEPERATOR ';'
 #define DIRECTORY_SYMBOL "\\"
+#define DRIVER_PATH_REGISTRY_VALUE "XGL_DRIVERS_PATH"
+#define LAYERS_PATH_REGISTRY_VALUE "XGL_LAYERS_PATH"
+#define LAYER_NAMES_REGISTRY_VALUE "XGL_LAYER_NAMES"
+#define DRIVER_PATH_ENV "XGL_DRIVERS_PATH"
+#define LAYERS_PATH_ENV "XGL_LAYERS_PATH"
+#define LAYER_NAMES_ENV "XGL_LAYER_NAMES"
 #ifndef DEFAULT_XGL_DRIVERS_PATH
 // TODO: Is this a good default location?
 // Need to search for both 32bit and 64bit ICDs