d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d024b33ca1
commit
20b52b61c6
|
@ -630,7 +630,11 @@ static BOOL load_d3dcompiler(void)
|
||||||
{
|
{
|
||||||
HMODULE module;
|
HMODULE module;
|
||||||
|
|
||||||
|
#if D3D_COMPILER_VERSION == 47
|
||||||
|
if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE;
|
||||||
|
#else
|
||||||
if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE;
|
if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE;
|
||||||
|
#endif
|
||||||
|
|
||||||
ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile");
|
ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile");
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -648,7 +652,7 @@ START_TEST(hlsl)
|
||||||
|
|
||||||
if (!load_d3dcompiler())
|
if (!load_d3dcompiler())
|
||||||
{
|
{
|
||||||
win_skip("Could not load d3dcompiler_43.dll\n");
|
win_skip("Could not load DLL.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue