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

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Tue Sep  1 00:27:34 2015 +0200

d3d11: Implement d3d11_texture3d_GetDevice().

---

 dlls/d3d11/d3d11_private.h |  2 +-
 dlls/d3d11/texture.c       | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index c0513a8..c5379ed 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -126,7 +126,7 @@ struct d3d_texture3d
     struct wined3d_private_store private_store;
     struct wined3d_texture *wined3d_texture;
     D3D10_TEXTURE3D_DESC desc;
-    ID3D10Device1 *device;
+    ID3D11Device *device;
 };
 
 HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device,
diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c
index adb7474..55f5d49 100644
--- a/dlls/d3d11/texture.c
+++ b/dlls/d3d11/texture.c
@@ -588,7 +588,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface)
 
     if (refcount == 1)
     {
-        ID3D10Device1_AddRef(texture->device);
+        ID3D11Device_AddRef(texture->device);
         wined3d_mutex_lock();
         wined3d_texture_incref(texture->wined3d_texture);
         wined3d_mutex_unlock();
@@ -614,14 +614,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
 
     if (!refcount)
     {
-        ID3D10Device1 *device = texture->device;
+        ID3D11Device *device = texture->device;
 
         wined3d_mutex_lock();
         wined3d_texture_decref(texture->wined3d_texture);
         wined3d_mutex_unlock();
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D10Device1_Release(device);
+        ID3D11Device_Release(device);
     }
 
     return refcount;
@@ -629,7 +629,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
 
 static void STDMETHODCALLTYPE d3d11_texture3d_GetDevice(ID3D11Texture3D *iface, ID3D11Device **device)
 {
-    FIXME("iface %p, device %p stub!\n", iface, device);
+    struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface);
+
+    TRACE("iface %p, device %p.\n", iface, device);
+
+    *device = texture->device;
+    ID3D11Device_AddRef(*device);
 }
 
 static HRESULT STDMETHODCALLTYPE d3d11_texture3d_GetPrivateData(ID3D11Texture3D *iface,
@@ -740,8 +745,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface,
 
     TRACE("iface %p, device %p.\n", iface, device);
 
-    *device = (ID3D10Device *)texture->device;
-    ID3D10Device_AddRef(*device);
+    ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
 }
 
 static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface,
@@ -917,8 +921,8 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev
     wined3d_mutex_unlock();
     texture->desc.MipLevels = levels;
 
-    texture->device = &device->ID3D10Device1_iface;
-    ID3D10Device1_AddRef(texture->device);
+    texture->device = &device->ID3D11Device_iface;
+    ID3D11Device_AddRef(texture->device);
 
     return S_OK;
 }