Skip to content

A
angle
Commit 46848420 by Jamie Madill Committed by Commit Bot
Options

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: 's avatarOmar El Sheikh <theoking@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent c43cdad2
Showing with 3 additions and 1 deletion
src/libANGLE/renderer/vulkan/RendererVk.cpp
...@@ -136,13 +136,14 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable ...@@ -136,13 +136,14 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
mEnableMockICD = false; mEnableMockICD = false;
} }
} }
if (mEnableValidationLayers) if (mEnableValidationLayers || mEnableMockICD)
{ {
const auto &cwd = angle::GetCWD(); const auto &cwd = angle::GetCWD();
if (!cwd.valid()) if (!cwd.valid())
{ {
ERR() << "Error getting CWD for Vulkan layers init."; ERR() << "Error getting CWD for Vulkan layers init.";
mEnableValidationLayers = false; mEnableValidationLayers = false;
mEnableMockICD = false;
} }
else else
{ {
...@@ -153,6 +154,7 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable ...@@ -153,6 +154,7 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
{ {
ERR() << "Error setting CWD for Vulkan layers init."; ERR() << "Error setting CWD for Vulkan layers init.";
mEnableValidationLayers = false; mEnableValidationLayers = false;
mEnableMockICD = false;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment