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/1169426Reviewed-by: Omar El Sheikh <theoking@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Vulkan: Fix perftests null driver.
46848420 · Jamie Madill · Commit Bot · c43cdad2 · 46848420
Commit 46848420 authored Aug 09, 2018 by Jamie Madill Committed by Commit Bot Aug 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +3 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -136,13 +136,14 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
                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 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
                {
                    ERR() << "Error setting CWD for Vulkan layers init.";
                    mEnableValidationLayers = false;
+                    mEnableMockICD          = false;
                }
            }
        }