Commit c917a987 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

d3d11: Implement d3d11_texture2d_GetDevice.

parent 3c74e223
...@@ -95,7 +95,7 @@ struct d3d10_texture2d ...@@ -95,7 +95,7 @@ struct d3d10_texture2d
IUnknown *dxgi_surface; IUnknown *dxgi_surface;
struct wined3d_texture *wined3d_texture; struct wined3d_texture *wined3d_texture;
D3D10_TEXTURE2D_DESC desc; D3D10_TEXTURE2D_DESC desc;
ID3D10Device1 *device; ID3D11Device *device;
}; };
static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface)
......
...@@ -76,7 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) ...@@ -76,7 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)
if (refcount == 1) if (refcount == 1)
{ {
ID3D10Device1_AddRef(texture->device); ID3D11Device_AddRef(texture->device);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_texture_incref(texture->wined3d_texture); wined3d_texture_incref(texture->wined3d_texture);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
...@@ -94,14 +94,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) ...@@ -94,14 +94,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)
if (!refcount) if (!refcount)
{ {
ID3D10Device1 *device = texture->device; ID3D11Device *device = texture->device;
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_texture_decref(texture->wined3d_texture); wined3d_texture_decref(texture->wined3d_texture);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be /* Release the device last, it may cause the wined3d device to be
* destroyed. */ * destroyed. */
ID3D10Device1_Release(device); ID3D11Device_Release(device);
} }
return refcount; return refcount;
...@@ -109,7 +109,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) ...@@ -109,7 +109,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)
static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, ID3D11Device **device) static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, ID3D11Device **device)
{ {
FIXME("iface %p, device %p stub!\n", iface, device); struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface);
TRACE("iface %p, device %p.\n", iface, device);
*device = texture->device;
ID3D11Device_AddRef(*device);
} }
static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface, static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface,
...@@ -262,8 +267,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, ...@@ -262,8 +267,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface,
TRACE("iface %p, device %p.\n", iface, device); TRACE("iface %p, device %p.\n", iface, device);
*device = (ID3D10Device *)texture->device; ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
ID3D10Device_AddRef(*device);
} }
static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface,
...@@ -494,8 +498,8 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device ...@@ -494,8 +498,8 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device
} }
wined3d_mutex_unlock(); wined3d_mutex_unlock();
texture->device = &device->ID3D10Device1_iface; texture->device = &device->ID3D11Device_iface;
ID3D10Device1_AddRef(texture->device); ID3D11Device_AddRef(texture->device);
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment