Matteo Bruni : d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests.
Alexandre Julliard
julliard at winehq.org
Fri Jan 3 15:25:06 CST 2020
Module: wine
Branch: master
Commit: 20b52b61c60afe433dc73063ee19b925cea93176
URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b52b61c60afe433dc73063ee19b925cea93176
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri Jan 3 20:52:33 2020 +0100
d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dcompiler_43/tests/hlsl.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c
index 8985cd51bb..868693838c 100644
--- a/dlls/d3dcompiler_43/tests/hlsl.c
+++ b/dlls/d3dcompiler_43/tests/hlsl.c
@@ -630,7 +630,11 @@ static BOOL load_d3dcompiler(void)
{
HMODULE module;
+#if D3D_COMPILER_VERSION == 47
+ if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE;
+#else
if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE;
+#endif
ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile");
return TRUE;
@@ -648,7 +652,7 @@ START_TEST(hlsl)
if (!load_d3dcompiler())
{
- win_skip("Could not load d3dcompiler_43.dll\n");
+ win_skip("Could not load DLL.\n");
return;
}
More information about the wine-cvs
mailing list