commit 1b94c585682b667c266c1ef4dcb3b2e34be788e4
author Jamie Madill <jmadill@chromium.org> Sun Apr 10 15:09:38 2022
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Sun Apr 10 22:23:18 2022
tree d0fa48bdf0a81c05f4ecdf292166a9ca959eafb9
parent 727cd8ef6634497a6b25fe24022b1b4d7726e5cd

Revert "Vulkan: Switch loader to new driver files env var."

This reverts commit 1f6123d55467c2af7c67405c0101a6f327b76225.

Reason for revert: Seems to break ANGLE on fuchsia loader:
https://ci.chromium.org/ui/p/chromium/builders/try/fuchsia_arm64/1123629/overview

Original change's description:
> Vulkan: Switch loader to new driver files env var.
>
> VK_DRIVER_FILES replaces VK_ICD_FILENAMES.
>
> Bug: angleproject:7095
> Change-Id: I949ac9a8f375240b6c6068825eccc645f81b0185
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3522821
> Reviewed-by: Ian Elliott <ianelliott@google.com>
> Reviewed-by: Yuxin Hu <yuxinhu@google.com>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:7095
Change-Id: I5b7e094b08d76b9c14adb4acb3b59e4cfb7a28fa
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3580980
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/common/vulkan/vulkan_icd.cpp

diff --git a/src/common/vulkan/vulkan_icd.cpp b/src/common/vulkan/vulkan_icd.cpp
index 2df47ab..697d778 100644
--- a/src/common/vulkan/vulkan_icd.cpp
+++ b/src/common/vulkan/vulkan_icd.cpp
@@ -57,7 +57,7 @@
 ANGLE_MAYBE_UNUSED constexpr char kLoaderLayersPathEnv[] = "VK_LAYER_PATH";
 ANGLE_MAYBE_UNUSED constexpr char kLayerEnablesEnv[]     = "VK_LAYER_ENABLES";
 
-constexpr char kLoaderDriverFilesEnv[]               = "VK_DRIVER_FILES";
+constexpr char kLoaderICDFilenamesEnv[]              = "VK_ICD_FILENAMES";
 constexpr char kANGLEPreferredDeviceEnv[]            = "ANGLE_PREFERRED_DEVICE";
 constexpr char kValidationLayersCustomSTypeListEnv[] = "VK_LAYER_CUSTOM_STYPE_LIST";
 constexpr char kNoDeviceSelect[]                     = "NODEVICE_SELECT";
@@ -203,7 +203,7 @@
     }
     if (mChangedICDEnv)
     {
-        ResetEnvironmentVar(kLoaderDriverFilesEnv, mPreviousICDEnv);
+        ResetEnvironmentVar(kLoaderICDFilenamesEnv, mPreviousICDEnv);
     }
 
     ResetEnvironmentVar(kValidationLayersCustomSTypeListEnv, mPreviousCustomExtensionsEnv);
@@ -218,8 +218,8 @@
 {
     // Override environment variable to use built Mock ICD
     // ANGLE_VK_ICD_JSON gets set to the built mock ICD in BUILD.gn
-    mPreviousICDEnv = angle::GetEnvironmentVar(kLoaderDriverFilesEnv);
-    mChangedICDEnv  = angle::SetEnvironmentVar(kLoaderDriverFilesEnv, icd);
+    mPreviousICDEnv = angle::GetEnvironmentVar(kLoaderICDFilenamesEnv);
+    mChangedICDEnv  = angle::SetEnvironmentVar(kLoaderICDFilenamesEnv, icd);
 
     if (!mChangedICDEnv)
     {

src/libANGLE/renderer/vulkan/vk_utils.cpp

diff --git a/src/libANGLE/renderer/vulkan/vk_utils.cpp b/src/libANGLE/renderer/vulkan/vk_utils.cpp
index 2bfe694..f8135c4 100644
--- a/src/libANGLE/renderer/vulkan/vk_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_utils.cpp
@@ -363,6 +363,9 @@
 
 namespace vk
 {
+const char *gLoaderLayersPathEnv   = "VK_LAYER_PATH";
+const char *gLoaderICDFilenamesEnv = "VK_ICD_FILENAMES";
+
 VkImageAspectFlags GetDepthStencilAspectFlags(const angle::Format &format)
 {
     return (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |