Skip to content

W
wine-winehq
Commit 41740bec authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

d3d11: Implement d3d11_depthstencil_view_GetDevice().

parent ca4017d2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
dlls/d3d11/d3d11_private.h
View file @ 41740bec
...@@ -160,7 +160,7 @@ struct d3d_depthstencil_view ...@@ -160,7 +160,7 @@ struct d3d_depthstencil_view
struct wined3d_rendertarget_view *wined3d_view; struct wined3d_rendertarget_view *wined3d_view;
D3D10_DEPTH_STENCIL_VIEW_DESC desc; D3D10_DEPTH_STENCIL_VIEW_DESC desc;
ID3D10Resource *resource; ID3D10Resource *resource;
ID3D10Device1 *device; ID3D11Device *device;
}; };
HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device, HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device,
......
dlls/d3d11/view.c
View file @ 41740bec
...@@ -418,7 +418,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci ...@@ -418,7 +418,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_rendertarget_view_decref(view->wined3d_view); wined3d_rendertarget_view_decref(view->wined3d_view);
ID3D10Resource_Release(view->resource); ID3D10Resource_Release(view->resource);
ID3D10Device1_Release(view->device); ID3D11Device_Release(view->device);
wined3d_private_store_cleanup(&view->private_store); wined3d_private_store_cleanup(&view->private_store);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
HeapFree(GetProcessHeap(), 0, view); HeapFree(GetProcessHeap(), 0, view);
...@@ -430,7 +430,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci ...@@ -430,7 +430,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci
static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetDevice(ID3D11DepthStencilView *iface, static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetDevice(ID3D11DepthStencilView *iface,
ID3D11Device **device) ID3D11Device **device)
{ {
FIXME("iface %p, device %p stub!\n", iface, device); struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface);
TRACE("iface %p, device %p.\n", iface, device);
*device = view->device;
ID3D11Device_AddRef(*device);
} }
static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_GetPrivateData(ID3D11DepthStencilView *iface, static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_GetPrivateData(ID3D11DepthStencilView *iface,
...@@ -537,8 +542,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc ...@@ -537,8 +542,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc
TRACE("iface %p, device %p.\n", iface, device); TRACE("iface %p, device %p.\n", iface, device);
*device = (ID3D10Device *)view->device; ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
ID3D10Device_AddRef(*device);
} }
static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface,
...@@ -709,8 +713,8 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3 ...@@ -709,8 +713,8 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3
wined3d_mutex_unlock(); wined3d_mutex_unlock();
view->resource = resource; view->resource = resource;
ID3D10Resource_AddRef(resource); ID3D10Resource_AddRef(resource);
view->device = &device->ID3D10Device1_iface; view->device = &device->ID3D11Device_iface;
ID3D10Device1_AddRef(view->device); ID3D11Device_AddRef(view->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