Vulkan: Fix swiftshader device selection

A recent SwS roll changed the deviceName of swiftshader to include the backend (LLVM for example). That made ANGLE no longer recognize SwiftShader. This change looks for the known SwS device name as a prefix of the deviceName retrieved from the device, rather than a complete match. Bug: angleproject:3876 Change-Id: If6dacb1e5685493d5334cad2015439f0f6b71124 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1980275Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Fix swiftshader device selection
e2fc92ca · Shahbaz Youssefi · Commit Bot · 07f0f019 · e2fc92ca
Commit e2fc92ca authored Dec 23, 2019 by Shahbaz Youssefi Committed by Commit Bot Dec 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -483,7 +483,8 @@ ICDFilterFunc GetFilterForICD(vk::ICD preferredICD)
            return [](const VkPhysicalDeviceProperties &deviceProperties) {
                return ((deviceProperties.vendorID == VENDOR_ID_GOOGLE) &&
                        (deviceProperties.deviceID == kSwiftShaderDeviceID) &&
-                        (strcmp(deviceProperties.deviceName, kSwiftShaderDeviceName) == 0));
+                        (strncmp(deviceProperties.deviceName, kSwiftShaderDeviceName,
+                                 strlen(kSwiftShaderDeviceName)) == 0));
            };
        default:
            return [](const VkPhysicalDeviceProperties &deviceProperties) { return true; };