commit 468484201532b92bdddc3194a66a49aee8cc4a80
author Jamie Madill <jmadill@chromium.org> Thu Aug 09 10:46:06 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Aug 09 20:05:53 2018 +0000
tree ed1f32edc5e599af181c52b2bd83e84072e40084
parent c43cdad25851a5602698fedbf1a96bf5673d69a2

Vulkan: Fix perftests null driver.

We needed to set the CWD for the mock ICD as well.

Bug: angleproject:2604
Change-Id: I1d285c478030056360fd2dceca78e231ac321219
Reviewed-on: https://chromium-review.googlesource.com/1169426
Reviewed-by: Omar El Sheikh <theoking@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/RendererVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index abd9f6f..d748b03 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -136,13 +136,14 @@
                 mEnableMockICD = false;
             }
         }
-        if (mEnableValidationLayers)
+        if (mEnableValidationLayers || mEnableMockICD)
         {
             const auto &cwd = angle::GetCWD();
             if (!cwd.valid())
             {
                 ERR() << "Error getting CWD for Vulkan layers init.";
                 mEnableValidationLayers = false;
+                mEnableMockICD          = false;
             }
             else
             {
@@ -153,6 +154,7 @@
                 {
                     ERR() << "Error setting CWD for Vulkan layers init.";
                     mEnableValidationLayers = false;
+                    mEnableMockICD          = false;
                 }
             }
         }