Vulkan: Fix SwiftShader disabled build.

Disabling SwiftShader in the GN build led to a compile error when trying to use ANGLE_VK_SWIFTSHADER_ICD_JSON. Bug: angleproject:4223 Change-Id: I076a88e6bc58adf1e34bbb7286b1f46028cd021a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1969059 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Vulkan: Fix SwiftShader disabled build.
7e19e25e · Jamie Madill · Commit Bot · d674e1e5 · 7e19e25e
Commit 7e19e25e authored Dec 16, 2019 by Jamie Madill Committed by Commit Bot Dec 17, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +2 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -374,6 +374,7 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
                ERR() << "Error setting environment for Mock/Null Driver.";
            }
        }
+#    if defined(ANGLE_VK_SWIFTSHADER_ICD_JSON)
        else if (icd == vk::ICD::SwiftShader)
        {
            if (!setICDEnvironment(ANGLE_VK_SWIFTSHADER_ICD_JSON))
@@ -381,6 +382,7 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
                ERR() << "Error setting environment for SwiftShader.";
            }
        }
+#    endif  // defined(ANGLE_VK_SWIFTSHADER_ICD_JSON)
        if (mEnableValidationLayers || icd != vk::ICD::Default)
        {
            const auto &cwd = angle::GetCWD();