From b90215f3508b82e85951a54c7800ac660843ba81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3zef=20Kucia?= Date: Tue, 20 Oct 2015 01:46:40 +0200 Subject: [PATCH] d3d11: Implement d3d10_device_CreateShaderResourceView1(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d11/device.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 981266f240c..c471810cc12 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3380,8 +3380,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface, + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_shader_resource_view *object; @@ -3402,11 +3402,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (FAILED(hr)) return hr; - *view = (ID3D10ShaderResourceView *)&object->ID3D10ShaderResourceView1_iface; + *view = &object->ID3D10ShaderResourceView1_iface; return S_OK; } +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) +{ + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + return d3d10_device_CreateShaderResourceView1(iface, resource, + (const D3D10_SHADER_RESOURCE_VIEW_DESC1 *)desc, (ID3D10ShaderResourceView1 **)view); +} + static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { @@ -3784,14 +3793,6 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view) -{ - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); - - return E_NOTIMPL; -} - static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) { -- 2.11.4.GIT