ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Implement d3d11_device_CreateRenderTargetView().

This commit is contained in:
Józef Kucia 2015-09-09 01:35:45 +02:00 committed by Alexandre Julliard
parent 818051c50f
commit 9a0d564683
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3d11/d3d11_private.h
View File

@ -184,8 +184,8 @@ struct d3d_rendertarget_view
ID3D10Device1 *device; ID3D10Device1 *device;
}; };
HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource,
ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN;
struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN;
/* ID3D10ShaderResourceView */ /* ID3D10ShaderResourceView */

29
dlls/d3d11/device.c
View File

@ -135,9 +135,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device *iface,
ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **view) ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **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_rendertarget_view *object;
HRESULT hr;
TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
if (FAILED(hr = d3d_rendertarget_view_create(device, resource, desc, &object)))
return hr;
*view = &object->ID3D11RenderTargetView_iface;
return S_OK;
return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface,
@ -2128,28 +2138,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic
TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource))) if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource)))
{ {
ERR("Resource does not implement ID3D11Resource.\n"); ERR("Resource does not implement ID3D11Resource.\n");
HeapFree(GetProcessHeap(), 0, object);
return E_FAIL; return E_FAIL;
} }
if (FAILED(hr = d3d_rendertarget_view_init(object, device, d3d11_resource, hr = d3d_rendertarget_view_create(device, d3d11_resource, (const D3D11_RENDER_TARGET_VIEW_DESC *)desc, &object);
(const D3D11_RENDER_TARGET_VIEW_DESC *)desc)))
{
WARN("Failed to initialize rendertarget view, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
ID3D11Resource_Release(d3d11_resource); ID3D11Resource_Release(d3d11_resource);
if (FAILED(hr))
return hr; return hr;
}
ID3D11Resource_Release(d3d11_resource);
TRACE("Created rendertarget view %p.\n", object);
*view = &object->ID3D10RenderTargetView_iface; *view = &object->ID3D10RenderTargetView_iface;
return S_OK; return S_OK;

24
dlls/d3d11/view.c
View File

@ -1095,7 +1095,7 @@ static void wined3d_rendertarget_view_desc_from_d3d11(struct wined3d_rendertarge
} }
} }
HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device,
ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc) ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc)
{ {
struct wined3d_rendertarget_view_desc wined3d_desc; struct wined3d_rendertarget_view_desc wined3d_desc;
@ -1143,6 +1143,28 @@ HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3
return S_OK; return S_OK;
} }
HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource,
const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view)
{
struct d3d_rendertarget_view *object;
HRESULT hr;
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc)))
{
WARN("Failed to initialize rendertarget view, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
TRACE("Created rendertarget view %p.\n", object);
*view = object;
return S_OK;
}
struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface)
{ {
if (!iface) if (!iface)