Skip to content

S
swiftshader
Commit 9dc41fd8 by Nicolas Capens Committed by Nicolas Capens
Options

Support running Vulkan unit tests from the output directory

This also fixes running them from within Visual Studio without requiring setting any environment variables. Change-Id: I5592b2d6a0abfeaeffbe1b788529c77adf5764ed Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35629 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent b52384b4
Showing with 3 additions and 2 deletions
tests/VulkanUnitTests/Driver.cpp
...@@ -64,15 +64,16 @@ bool Driver::loadSwiftShader() ...@@ -64,15 +64,16 @@ bool Driver::loadSwiftShader()
#else #else
return load("./build/Release_Win32/vk_swiftshader.dll") || return load("./build/Release_Win32/vk_swiftshader.dll") ||
#endif #endif
load("./build/Release/libvk_swiftshader.dll"); load("./build/Release/libvk_swiftshader.dll") ||
#else #else
#if defined(_WIN64) #if defined(_WIN64)
return load("./build/Debug_x64/vk_swiftshader.dll") || return load("./build/Debug_x64/vk_swiftshader.dll") ||
#else #else
return load("./build/Debug_Win32/vk_swiftshader.dll") || return load("./build/Debug_Win32/vk_swiftshader.dll") ||
#endif #endif
load("./build/Debug/libvk_swiftshader.dll"); load("./build/Debug/libvk_swiftshader.dll") ||
#endif #endif
load("./libvk_swiftshader.dll");
#elif OS_MAC #elif OS_MAC
return load("./build/Darwin/libvk_swiftshader.dylib") || return load("./build/Darwin/libvk_swiftshader.dylib") ||
load("swiftshader/libvk_swiftshader.dylib") || load("swiftshader/libvk_swiftshader.dylib") ||
......
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