xcb_nvidia: Hack in ability to use registry instead of getenv().

Trying to make it easy/quick to change between ICDs, which the registry allows.
Need to clean this up sometime.

1 files changed, 21 insertions, 0 deletions

diff --git a/libs/xcb_nvidia/xcb_nvidia.cpp b/libs/xcb_nvidia/xcb_nvidia.cpp
index c4517e1b..17cb8d1c 100644
--- a/libs/xcb_nvidia/xcb_nvidia.cpp
+++ b/libs/xcb_nvidia/xcb_nvidia.cpp
@@ -43,6 +43,27 @@ xcb_connection_t * xcb_connect(const char *displayname, int *screenp)
         module = LoadLibrary(xglNulldrv.c_str());
     }
     if (!module) {
+        // TODO: Adapted up the following code (copied from "loader.c"):
+#define INITIAL_STR_LEN 1024
+        char *registry_str = (char *) malloc(INITIAL_STR_LEN);
+        DWORD registry_len = INITIAL_STR_LEN;
+        DWORD registry_value_type;
+        LONG  registry_return_value;
+        char *rtn_str = NULL;
+        size_t rtn_len;
+
+        registry_return_value = RegGetValue(HKEY_LOCAL_MACHINE, "Software\\XGL",
+                                            "XGL_DRIVERS_PATH",
+                                            (RRF_RT_REG_SZ | RRF_ZEROONFAILURE),
+                                            &registry_value_type,
+                                            (PVOID) registry_str,
+                                            &registry_len);
+        rtn_len = registry_len + 16;
+        rtn_str = (char *) malloc(rtn_len);
+        _snprintf(rtn_str, rtn_len, "%s\\%s", registry_str, "xgl_nvidia.dll");
+        module = LoadLibrary(rtn_str);
+    }
+    if (!module) {
         return 0;
     }