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

wined3d: Get resource info from the rendertarget view in device_clear_render_targets(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-03-06 20:59:47 +01:00 committed by Alexandre Julliard
parent 1e78dd3197
commit 2d8a1034fa
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wined3d/device.c
View File

@ -320,13 +320,15 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
* checking all this if the dest surface is in the drawable anyway. */ * checking all this if the dest surface is in the drawable anyway. */
for (i = 0; i < rt_count; ++i) for (i = 0; i < rt_count; ++i)
{ {
struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(fb->render_targets[i]); struct wined3d_rendertarget_view *rtv = fb->render_targets[i];
if (rt && rt->resource.format->id != WINED3DFMT_NULL) struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv);
if (rt && rtv->format->id != WINED3DFMT_NULL)
{ {
if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, clear_rect)) if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, clear_rect))
surface_load_location(rt, context, rt->container->resource.draw_binding); surface_load_location(rt, context, rtv->resource->draw_binding);
else else
wined3d_surface_prepare(rt, context, rt->container->resource.draw_binding); wined3d_surface_prepare(rt, context, rtv->resource->draw_binding);
} }
} }
@ -394,12 +396,13 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
{ {
for (i = 0; i < rt_count; ++i) for (i = 0; i < rt_count; ++i)
{ {
struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(fb->render_targets[i]); struct wined3d_rendertarget_view *rtv = fb->render_targets[i];
struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv);
if (rt) if (rt)
{ {
surface_validate_location(rt, rt->container->resource.draw_binding); surface_validate_location(rt, rtv->resource->draw_binding);
surface_invalidate_location(rt, ~rt->container->resource.draw_binding); surface_invalidate_location(rt, ~rtv->resource->draw_binding);
} }
} }