diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-12-17 17:38:24 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-17 17:38:55 -0700 |
| commit | dc00bdb8fb119b7bda241553b8f4e7f1bcac3bbb (patch) | |
| tree | e1ebf04df0e22a8392dbe33c5ff769541e190522 /loader/vk_loader_platform.h | |
| parent | aaffcb05a641e771207ef3cf8b60ead2833becab (diff) | |
| download | usermoji-dc00bdb8fb119b7bda241553b8f4e7f1bcac3bbb.tar.xz | |
loader: Add support for implicit layers
Diffstat (limited to 'loader/vk_loader_platform.h')
| -rw-r--r-- | loader/vk_loader_platform.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h index 257fdf2f..55b84dba 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -67,14 +67,16 @@ #define LOCAL_DRIVERS_INFO \ LOCALPREFIX "/" SYSCONFDIR VULKAN_ICDCONF_DIR ":" \ LOCALPREFIX "/" DATADIR VULKAN_ICDCONF_DIR ":" -#define LOCAL_LAYERS_INFO \ +#define LOCAL_ELAYERS_INFO \ LOCALPREFIX "/" SYSCONFDIR VULKAN_ELAYERCONF_DIR ":" \ + LOCALPREFIX "/" DATADIR VULKAN_ELAYERCONF_DIR ":" +#define LOCAL_ILAYERS_INFO \ LOCALPREFIX "/" SYSCONFDIR VULKAN_ILAYERCONF_DIR ":" \ - LOCALPREFIX "/" DATADIR VULKAN_ELAYERCONF_DIR ":" \ LOCALPREFIX "/" DATADIR VULKAN_ILAYERCONF_DIR ":" #else #define LOCAL_DRIVERS_INFO -#define LOCAL_LAYERS_INFO +#define LOCAL_ELAYERS_INFO +#define LOCAL_ILAYERS_INFO #endif #define DEFAULT_VK_DRIVERS_INFO \ @@ -82,11 +84,13 @@ "/" SYSCONFDIR VULKAN_ICDCONF_DIR ":" \ "/usr/" DATADIR VULKAN_ICDCONF_DIR #define DEFAULT_VK_DRIVERS_PATH "" -#define DEFAULT_VK_LAYERS_INFO \ - LOCAL_LAYERS_INFO \ +#define DEFAULT_VK_ELAYERS_INFO \ + LOCAL_ELAYERS_INFO \ "/" SYSCONFDIR VULKAN_ELAYERCONF_DIR ":" \ + "/usr/" DATADIR VULKAN_ELAYERCONF_DIR ":" +#define DEFAULT_VK_ILAYERS_INFO \ + LOCAL_ILAYERS_INFO \ "/" SYSCONFDIR VULKAN_ILAYERCONF_DIR ":" \ - "/usr/" DATADIR VULKAN_ELAYERCONF_DIR ":" \ "/usr/" DATADIR VULKAN_ILAYERCONF_DIR #define DEFAULT_VK_LAYERS_PATH "" #define LAYERS_PATH_ENV "VK_LAYER_PATH" @@ -226,7 +230,8 @@ using namespace std; #define DEFAULT_VK_DRIVERS_INFO "SOFTWARE\\Khronos\\Vulkan\\Drivers" // TODO: Are these the correct paths #define DEFAULT_VK_DRIVERS_PATH "C:\\Windows\\System32;C:\\Windows\\SysWow64" -#define DEFAULT_VK_LAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ExplicitLayers;SOFTWARE\\Khronos\\Vulkan\\ImplicitLayers" +#define DEFAULT_VK_ELAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ExplicitLayers" +#define DEFAULT_VK_ILAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ImplicitLayers" #define DEFAULT_VK_LAYERS_PATH "C:\\Windows\\System32;C:\\Windows\\SysWow64" #define LAYERS_PATH_ENV "VK_LAYER_PATH" |