aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2015-07-20 13:15:43 -0400
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-07-22 08:52:42 -0600
commit7c63c58fdc2110a028f4b0fe8bb297263a38cf88 (patch)
tree0f8603a870533ae1e2186990148194cbc91afc3d
parentb6dba5c819d540baf7296ed09222190e77f97c30 (diff)
downloadusermoji-7c63c58fdc2110a028f4b0fe8bb297263a38cf88.tar.xz
loader: Fix ICD and layer directory scan order on Linux
The convention is to scan /etc for host-specific settings before looking in /usr/share, which may be a shared network filesystem. Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--loader/vk_loader_platform.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
index 34245cc6..fa78b754 100644
--- a/loader/vk_loader_platform.h
+++ b/loader/vk_loader_platform.h
@@ -52,9 +52,9 @@
#define DIRECTORY_SYMBOL '/'
// TODO: Need to handle different Linux distros
-#define DEFAULT_VK_DRIVERS_INFO "/usr/share/vulkan/icd.d:/etc/vulkan/icd.d"
+#define DEFAULT_VK_DRIVERS_INFO "/etc/vulkan/icd.d:/usr/share/vulkan/icd.d"
#define DEFAULT_VK_DRIVERS_PATH "/usr/lib/i386-linux-gnu/vulkan/icd:/usr/lib/x86_64-linux-gnu/vulkan/icd"
-#define DEFAULT_VK_LAYERS_INFO "/usr/share/vulkan/explicit_layer.d:/usr/share/vulkan/implicit_layer.d:/etc/vulkan/explicit_layer.d:/etc/vulkan/implicit_layer.d"
+#define DEFAULT_VK_LAYERS_INFO "/etc/vulkan/explicit_layer.d:/etc/vulkan/implicit_layer.d:/usr/share/vulkan/explicit_layer.d:/usr/share/vulkan/implicit_layer.d"
#define DEFAULT_VK_LAYERS_PATH "/usr/lib/i386-linux-gnu/vulkan/layer:/usr/lib/x86_64-linux-gnu/vulkan/layer"
#define LAYERS_PATH_ENV "VK_LAYER_DIRS"