Simplify Vulkan ICD loading for testing

The STANDALONE preprocessor macro is only for controlling the loading of a delay loaded DLL, on Windows. Change-Id: Ife765f27c7e03c542d7e81d90c09c97e4e2cbe5d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/33248 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Ben Clayton <bclayton@google.com>

Simplify Vulkan ICD loading for testing
522d5121 · Nicolas Capens · Nicolas Capens · cd98c739 · 522d5121 · 522d5121
Commit 522d5121 authored Jun 21, 2019 by Nicolas Capens Committed by Nicolas Capens Jun 27, 2019
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 13 deletions

VulkanPlatform.h src/Vulkan/VulkanPlatform.h +0 -0

Driver.cpp tests/VulkanUnitTests/Driver.cpp +8 -13

No files found.
--- a/src/Vulkan/VulkanPlatform.h
+++ b/src/Vulkan/VulkanPlatform.h
--- a/tests/VulkanUnitTests/Driver.cpp
+++ b/tests/VulkanUnitTests/Driver.cpp
@@ -57,35 +57,30 @@ bool Driver::loadSwiftShader()
 		return true;
 	#elif defined(NDEBUG)
 		#if defined(_WIN64)
-			return load("./build/Release_Win64/vk_swiftshader.dll") ||
+			return load("./build/Release_x64/vk_swiftshader.dll") ||
 		#else
 			return load("./build/Release_Win32/vk_swiftshader.dll") ||
 		#endif
 			       load("./build/Release/libvk_swiftshader.dll");
 	#else
 		#if defined(_WIN64)
-			return load("./build/Debug_Win64/vk_swiftshader.dll") ||
+			return load("./build/Debug_x64/vk_swiftshader.dll") ||
 		#else
 			return load("./build/Debug_Win32/vk_swiftshader.dll") ||
 		#endif
 			       load("./build/Debug/libvk_swiftshader.dll");
 	#endif
 #elif OS_MAC
-    #if defined(STANDALONE)
-        return load("./build/Darwin/libvk_swiftshader.dylib");
-    #else
-        return load("libvulkan.dylib");
-    #endif
+	return load("./build/Darwin/libvk_swiftshader.dylib") ||
+	       load("swiftshader/libvulkan.dylib");
 #elif OS_LINUX
-    #if defined(STANDALONE)
-        return load("./build/Linux/libvk_swiftshader.so");
-    #else
-        return load("libvulkan.so");
-    #endif
+	return load("./build/Linux/libvk_swiftshader.so") ||
+	       load("swiftshader/libvulkan.so") ||
+	       load("libvk_swiftshader.so");
 #elif OS_ANDROID
 	return load("libvk_swiftshader.so");
 #else
-#    error Unimplemented platform
+	#error Unimplemented platform
 #endif
 }