Matteo Bruni : d3dcompiler/tests: Load the correct d3dcompiler DLL in the asm tests.
Alexandre Julliard
julliard at winehq.org
Fri Jan 3 15:25:06 CST 2020
Module: wine
Branch: master
Commit: d367c9aeff769171cad907b2ad4e125b92a8c472
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d367c9aeff769171cad907b2ad4e125b92a8c472
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri Jan 3 20:52:34 2020 +0100
d3dcompiler/tests: Load the correct d3dcompiler DLL in the asm tests.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dcompiler_43/tests/asm.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c
index 900e662843..749b115326 100644
--- a/dlls/d3dcompiler_43/tests/asm.c
+++ b/dlls/d3dcompiler_43/tests/asm.c
@@ -1725,7 +1725,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
pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble");
ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess");
@@ -1736,7 +1740,7 @@ START_TEST(asm)
{
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