commit b1a03e058b0dc85de109b9a6c5e4800ae7514cec
author Jon Ashburn <jon@lunarg.com> Thu Dec 24 13:58:35 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Thu Dec 24 13:58:35 2015 -0700
tree 1f19e8ebd4b447b5633a14b0302642b1e157f330
parent 0704af91eb3b49ce14454b4611b0663ff36966c5

loader: Don't override VK_LAYER_PATH for implicit layers

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index 544b6af..eb24398 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2208,7 +2208,8 @@
     // Get a list of manifest files for layers
     loader_get_manifest_files(inst, LAYERS_PATH_ENV, true, DEFAULT_VK_ELAYERS_INFO,
                               &manifest_files[0]);
-    loader_get_manifest_files(inst, LAYERS_PATH_ENV, true, DEFAULT_VK_ILAYERS_INFO,
+    // Pass NULL for environment variable override - implicit layers are not overridden by LAYERS_PATH_ENV
+    loader_get_manifest_files(inst, NULL, true, DEFAULT_VK_ILAYERS_INFO,
                               &manifest_files[1]);
     if (manifest_files[0].count == 0 && manifest_files[1].count == 0)
         return;