From dffafa95f3d60de7e73f0cc6cecaccfcd19bfddc Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Wed, 6 Apr 2016 18:26:46 -0400 Subject: loader: Add compile-time option for layer search paths. This enables programatically specifying search directories for the layer JSON files. This makes deploying and running compiled layers in local and automated testing with multiple configurations a much simpler process. Change-Id: I0904ef230d020004d8d71cbe265e83cdb6120db8 --- loader/vk_loader_platform.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'loader/vk_loader_platform.h') diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h index aed0a703..c94e33c0 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -106,6 +106,9 @@ "/" SYSCONFDIR VULKAN_ILAYERCONF_DIR ":" \ "/usr/" DATADIR VULKAN_ILAYERCONF_DIR #define DEFAULT_VK_LAYERS_PATH "" +#if !defined(LAYERS_SOURCE_PATH) +#define LAYERS_SOURCE_PATH NULL +#endif #define LAYERS_PATH_ENV "VK_LAYER_PATH" #define HOME_VK_DRIVERS_INFO "/.local/share" VULKAN_ICDCONF_DIR #define HOME_VK_ELAYERS_INFO "/.local/share" VULKAN_ELAYERCONF_DIR @@ -250,7 +253,12 @@ using namespace std; #define DEFAULT_VK_DRIVERS_PATH "" #define DEFAULT_VK_ELAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ExplicitLayers" #define DEFAULT_VK_ILAYERS_INFO "SOFTWARE\\Khronos\\Vulkan\\ImplicitLayers" +#if !defined(DEFAULT_VK_LAYERS_PATH) #define DEFAULT_VK_LAYERS_PATH "" +#endif +#if !defined(LAYERS_SOURCE_PATH) +#define LAYERS_SOURCE_PATH NULL +#endif #define LAYERS_PATH_ENV "VK_LAYER_PATH" #define HOME_VK_DRIVERS_INFO "" #define HOME_VK_ELAYERS_INFO "" -- cgit v1.2.3