Józef Kucia : d3d11: Implement d3d10_device_CreateShaderResourceView1().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b90215f3508b82e85951a54c7800ac660843ba81
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b90215f3508b82e85951a54c78...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Tue Oct 20 01:46:40 2015 +0200

d3d11: Implement d3d10_device_CreateShaderResourceView1().

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 981266f..c471810 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)
 {