diff --git a/dlls/d3dx10_43/tests/Makefile.in b/dlls/d3dx10_43/tests/Makefile.in index d135a7a33219ba8e77fea5c380c18a41350b7d6f..f9f988fb5c485145329af879882944e70e1136af 100644 --- a/dlls/d3dx10_43/tests/Makefile.in +++ b/dlls/d3dx10_43/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dx10_43.dll -IMPORTS = d3dx10 d3d10 +IMPORTS = d3dx10 C_SRCS = \ d3dx10.c diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 423ab4d4940dbd06f36955ef38ca9962d164e348..d91dbdc3a6aac8d94f30fb5b4ea0509a9f6bf635 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -41,12 +41,21 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static ID3D10Device *create_device(void) { ID3D10Device *device; + HMODULE d3d10_mod = LoadLibraryA("d3d10.dll"); + HRESULT (WINAPI *pD3D10CreateDevice)(IDXGIAdapter *, D3D10_DRIVER_TYPE, HMODULE, UINT, UINT, ID3D10Device **); - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (!d3d10_mod) + { + win_skip("d3d10.dll not present\n"); + return NULL; + } + + pD3D10CreateDevice = (void *)GetProcAddress(d3d10_mod, "D3D10CreateDevice"); + if (SUCCEEDED(pD3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(pD3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(pD3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; return NULL;