[PATCH 7/8] d3d11: Implement d3d11_device_CreateDepthStencilView().
Józef Kucia
jkucia at codeweavers.com
Mon Sep 7 18:12:47 CDT 2015
---
dlls/d3d11/d3d11_private.h | 4 ++--
dlls/d3d11/device.c | 29 ++++++++++++++---------------
dlls/d3d11/view.c | 24 +++++++++++++++++++++++-
3 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 6a134a3..c5593d7 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -166,8 +166,8 @@ struct d3d_depthstencil_view
ID3D11Device *device;
};
-HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device,
- ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN;
+HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource,
+ const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) DECLSPEC_HIDDEN;
struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN;
/* ID3D10RenderTargetView */
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index fad8fa3..d6065b4 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -143,9 +143,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface,
ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11DepthStencilView **view)
{
- FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view);
+ struct d3d_device *device = impl_from_ID3D11Device(iface);
+ struct d3d_depthstencil_view *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
+
+ if (FAILED(hr = d3d_depthstencil_view_create(device, resource, desc, &object)))
+ return hr;
+
+ *view = &object->ID3D11DepthStencilView_iface;
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device *iface,
@@ -2153,27 +2162,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic
memcpy(&d3d11_desc.u, &desc->u, sizeof(d3d11_desc.u));
}
- if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
- return E_OUTOFMEMORY;
-
if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource)))
{
ERR("Resource does not implement ID3D11Resource.\n");
- HeapFree(GetProcessHeap(), 0, object);
return E_FAIL;
}
- if (FAILED(hr = d3d_depthstencil_view_init(object, device, d3d11_resource, desc ? &d3d11_desc : NULL)))
- {
- WARN("Failed to initialize depthstencil view, hr %#x.\n", hr);
- HeapFree(GetProcessHeap(), 0, object);
- ID3D11Resource_Release(d3d11_resource);
- return hr;
- }
-
+ hr = d3d_depthstencil_view_create(device, d3d11_resource, desc ? &d3d11_desc : NULL, &object);
ID3D11Resource_Release(d3d11_resource);
+ if (FAILED(hr))
+ return hr;
- TRACE("Created depthstencil view %p.\n", object);
*view = &object->ID3D10DepthStencilView_iface;
return S_OK;
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 12db8e9..cff0948 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -687,7 +687,7 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_rendertarg
}
}
-HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device,
+static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device,
ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc)
{
struct wined3d_rendertarget_view_desc wined3d_desc;
@@ -735,6 +735,28 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3
return S_OK;
}
+HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource,
+ const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view)
+{
+ struct d3d_depthstencil_view *object;
+ HRESULT hr;
+
+ if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d3d_depthstencil_view_init(object, device, resource, desc)))
+ {
+ WARN("Failed to initialize depthstencil view, hr %#x.\n", hr);
+ HeapFree(GetProcessHeap(), 0, object);
+ return hr;
+ }
+
+ TRACE("Created depthstencil view %p.\n", object);
+ *view = object;
+
+ return S_OK;
+}
+
struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface)
{
if (!iface)
--
2.4.6
More information about the wine-patches
mailing list