=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Implement d3d11_rendertarget_view_GetDevice().
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 9 09:57:37 CDT 2015
Module: wine
Branch: master
Commit: 2b211cab69cd43a4aad7c6c6a6a9f342ce3a2161
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b211cab69cd43a4aad7c6c6a6a9f342ce3a2161
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Sep 9 01:35:46 2015 +0200
d3d11: Implement d3d11_rendertarget_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 cddef4d..8abd975 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -181,7 +181,7 @@ struct d3d_rendertarget_view
struct wined3d_rendertarget_view *wined3d_view;
D3D11_RENDER_TARGET_VIEW_DESC desc;
ID3D11Resource *resource;
- ID3D10Device1 *device;
+ ID3D11Device *device;
};
HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource,
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 195cd73..3010bac 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -827,7 +827,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge
wined3d_mutex_lock();
wined3d_rendertarget_view_decref(view->wined3d_view);
ID3D11Resource_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);
@@ -839,7 +839,12 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge
static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDevice(ID3D11RenderTargetView *iface,
ID3D11Device **device)
{
- FIXME("iface %p, device %p stub!\n", iface, device);
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface);
+
+ TRACE("iface %p, device %p.\n", iface, device);
+
+ *device = view->device;
+ ID3D11Device_AddRef(*device);
}
static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_GetPrivateData(ID3D11RenderTargetView *iface,
@@ -955,8 +960,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg
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_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface,
@@ -1137,8 +1141,8 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st
wined3d_mutex_unlock();
view->resource = resource;
ID3D11Resource_AddRef(resource);
- view->device = &device->ID3D10Device1_iface;
- ID3D10Device1_AddRef(view->device);
+ view->device = &device->ID3D11Device_iface;
+ ID3D11Device_AddRef(view->device);
return S_OK;
}
More information about the wine-cvs
mailing list