From a55e1d55b7157a9880b860249dc2edd4a9edd52a Mon Sep 17 00:00:00 2001 From: Lenny Komow Date: Mon, 7 Nov 2016 11:40:00 -0700 Subject: loader: Parameterize locations of drivers/layers Change-Id: I79c16e01f336b3cf90ec7e6e66901ad363502e7b --- loader/CMakeLists.txt | 1 + loader/vk_loader_platform.h | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'loader') diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 81aef4c4..f448e9f5 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -38,6 +38,7 @@ set (OPT_LOADER_SRCS ) set (LOADER_SRCS ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS}) +add_definitions(-DAPI_NAME="${API_NAME}") if (WIN32) # Use static MSVCRT libraries diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h index d13b645a..0ffc9238 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -239,11 +239,10 @@ using namespace std; #define PATH_SEPERATOR ';' #define DIRECTORY_SYMBOL '\\' #define DEFAULT_VK_REGISTRY_HIVE HKEY_LOCAL_MACHINE -#define DEFAULT_VK_DRIVERS_INFO "SOFTWARE\\Khronos\\Vulkan\\Drivers" -// TODO: Are these the correct paths +#define DEFAULT_VK_DRIVERS_INFO "SOFTWARE\\Khronos\\" API_NAME "\\Drivers" #define DEFAULT_VK_DRIVERS_PATH "" -#define DEFAULT_VK_ELAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ExplicitLayers" -#define DEFAULT_VK_ILAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ImplicitLayers" +#define DEFAULT_VK_ELAYERS_INFO "SOFTWARE\\Khronos\\" API_NAME "\\ExplicitLayers" +#define DEFAULT_VK_ILAYERS_INFO "SOFTWARE\\Khronos\\" API_NAME "\\ImplicitLayers" #if !defined(DEFAULT_VK_LAYERS_PATH) #define DEFAULT_VK_LAYERS_PATH "" #endif -- cgit v1.2.3