diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-08 15:36:08 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:17 +0800 |
| commit | 9cc421eb545767e22fd723dc573a7a3225261b1c (patch) | |
| tree | 2f6b6e233f1daf56a2123264a2347cbcc43a0f1b /libs | |
| parent | 89e99e6dd74c1f407c2f2cb1aac2ad4ca3d45ff2 (diff) | |
| download | vulkan-validation-layers-9cc421eb545767e22fd723dc573a7a3225261b1c.tar.gz | |
Stage 1 of rename
TODO: re-enable glave build, advance API for glave
v2: get rid of outdated code in tri introduced by rebase
rename wsi_null.c (olv)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/xcb_nvidia/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libs/xcb_nvidia/xcb_nvidia.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/xcb_nvidia/CMakeLists.txt b/libs/xcb_nvidia/CMakeLists.txt index 9937faf5b..482bdebab 100644 --- a/libs/xcb_nvidia/CMakeLists.txt +++ b/libs/xcb_nvidia/CMakeLists.txt @@ -3,8 +3,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS") +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS") add_library(xcb_nvidia STATIC xcb_nvidia.cpp) target_link_libraries(xcb_nvidia) diff --git a/libs/xcb_nvidia/xcb_nvidia.cpp b/libs/xcb_nvidia/xcb_nvidia.cpp index 71509512e..ce2c1dd99 100644 --- a/libs/xcb_nvidia/xcb_nvidia.cpp +++ b/libs/xcb_nvidia/xcb_nvidia.cpp @@ -2,7 +2,7 @@ #include <string> -#include <xgl.h> +#include <vulkan.h> // COPIED FROM "loader.c" (not pointed to, because we're about to delete this // code). Ian Elliott <ian@lunarg.com>. @@ -80,11 +80,11 @@ struct xcb_connection_t { xcb_connection_t * xcb_connect(const char *displayname, int *screenp) { - std::string xglNvidia = (getenv("XGL_DRIVERS_PATH") == NULL) ? "" : getenv("XGL_DRIVERS_PATH"); + std::string xglNvidia = (getenv("VK_DRIVERS_PATH") == NULL) ? "" : getenv("VK_DRIVERS_PATH"); xglNvidia += "\\XGL_nvidia.dll"; HMODULE module = LoadLibrary(xglNvidia.c_str()); if (!module) { - std::string xglNulldrv = (getenv("XGL_DRIVERS_PATH") == NULL) ? "" : getenv("XGL_DRIVERS_PATH"); + std::string xglNulldrv = (getenv("VK_DRIVERS_PATH") == NULL) ? "" : getenv("VK_DRIVERS_PATH"); xglNulldrv += "\\xgl_nulldrv.dll"; module = LoadLibrary(xglNulldrv.c_str()); } @@ -99,7 +99,7 @@ xcb_connection_t * xcb_connect(const char *displayname, int *screenp) registry_str = loader_get_registry_string(HKEY_LOCAL_MACHINE, "Software\\XGL", - "XGL_DRIVERS_PATH"); + "VK_DRIVERS_PATH"); registry_len = strlen(registry_str); rtn_len = registry_len + 16; rtn_str = (char *) malloc(rtn_len); |