Commit 204ffe15 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d10core: Properly handle parentless views in d3d10_device_OMGetRenderTargets().

parent d276bde0
...@@ -955,13 +955,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa ...@@ -955,13 +955,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i))) if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i))
|| !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view)))
{ {
render_target_views[i] = NULL; render_target_views[i] = NULL;
continue; continue;
} }
view_impl = wined3d_rendertarget_view_get_parent(wined3d_view);
render_target_views[i] = &view_impl->ID3D10RenderTargetView_iface; render_target_views[i] = &view_impl->ID3D10RenderTargetView_iface;
ID3D10RenderTargetView_AddRef(render_target_views[i]); ID3D10RenderTargetView_AddRef(render_target_views[i]);
} }
...@@ -971,13 +971,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa ...@@ -971,13 +971,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa
{ {
struct d3d10_depthstencil_view *view_impl; struct d3d10_depthstencil_view *view_impl;
if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device))) if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device))
|| !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view)))
{ {
*depth_stencil_view = NULL; *depth_stencil_view = NULL;
} }
else else
{ {
view_impl = wined3d_rendertarget_view_get_parent(wined3d_view);
*depth_stencil_view = &view_impl->ID3D10DepthStencilView_iface; *depth_stencil_view = &view_impl->ID3D10DepthStencilView_iface;
ID3D10DepthStencilView_AddRef(*depth_stencil_view); ID3D10DepthStencilView_AddRef(*depth_stencil_view);
} }
......
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