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

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Thu Sep 10 00:55:44 2015 +0200

d3d11: Implement d3d11_shader_resource_view_GetDevice().

---

dlls/d3d11/d3d11_private.h |  2 +-
 dlls/d3d11/view.c          | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index b5d0b72..420de97 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -199,7 +199,7 @@ struct d3d_shader_resource_view
     struct wined3d_shader_resource_view *wined3d_view;
     D3D10_SHADER_RESOURCE_VIEW_DESC desc;
     ID3D10Resource *resource;
-    ID3D10Device1 *device;
+    ID3D11Device *device;
 };

HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device,
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 7410916..cac8c25 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1239,7 +1239,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe
         wined3d_mutex_lock();
         wined3d_shader_resource_view_decref(view->wined3d_view);
         ID3D10Resource_Release(view->resource);
-        ID3D10Device1_Release(view->device);
+        ID3D11Device_Release(view->device);
         wined3d_private_store_cleanup(&view->private_store);
         wined3d_mutex_unlock();
         HeapFree(GetProcessHeap(), 0, view);
@@ -1251,7 +1251,12 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe
 static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDevice(ID3D11ShaderResourceView *iface,
         ID3D11Device **device)
 {
-    FIXME("iface %p, device %p stub!\n", iface, device);
+    struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface);
+
+    TRACE("iface %p, device %p.\n", iface, device);
+
+    *device = view->device;
+    ID3D11Device_AddRef(*device);
 }

static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_GetPrivateData(ID3D11ShaderResourceView *iface,
@@ -1359,8 +1364,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR

TRACE("iface %p, device %p.\n", iface, device);

-    *device = (ID3D10Device *)view->device;
-    ID3D10Device_AddRef(*device);
+    ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface,
@@ -1475,8 +1479,8 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str
     wined3d_mutex_unlock();
     view->resource = resource;
     ID3D10Resource_AddRef(resource);
-    view->device = &device->ID3D10Device1_iface;
-    ID3D10Device1_AddRef(view->device);
+    view->device = &device->ID3D11Device_iface;
+    ID3D11Device_AddRef(view->device);

return S_OK;
 }