From ef36a25aec33670cd2099e4bce379bd6e2ac42a0 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Thu, 21 Apr 2016 21:24:45 +0300 Subject: [PATCH] d3dx10: Implement D3DX10GetFeatureLevel1(). Signed-off-by: Nikolay Sivov Signed-off-by: Matteo Bruni Signed-off-by: Alexandre Julliard --- dlls/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10core.idl | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 6e67a6b6bf1..9338acaf6e1 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 +IMPORTS = d3d10_1 dxguid C_SRCS = \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 53059bfb802..7bfd9f35ad1 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -48,7 +48,7 @@ @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10FilterTexture(ptr long long) -@ stub D3DX10GetFeatureLevel1(ptr ptr) +@ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) @ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 1b60fc5ceb1..b28d56248f1 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -142,3 +142,10 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } + +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1) +{ + TRACE("device %p, device1 %p.\n", device, device1); + + return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 6d9927e40a5..524b9ee5e5f 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -68,3 +68,4 @@ interface ID3DX10ThreadPump : IUnknown cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") +cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);")