Henri Verbeet : wined3d: Use wined3d_texture_load_location() in device_clear_render_targets().
Alexandre Julliard
julliard at winehq.org
Tue Aug 2 17:33:32 CDT 2016
Module: wine
Branch: master
Commit: 56f60eed909974a8b41f4cc941deba0d793be933
URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f60eed909974a8b41f4cc941deba0d793be933
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Aug 2 12:26:30 2016 +0200
wined3d: Use wined3d_texture_load_location() in device_clear_render_targets().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/device.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 55046db..ce06474 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -324,15 +324,15 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
for (i = 0; i < rt_count; ++i)
{
struct wined3d_rendertarget_view *rtv = fb->render_targets[i];
- struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv);
- if (rt && rtv->format->id != WINED3DFMT_NULL)
+ if (rtv && rtv->format->id != WINED3DFMT_NULL)
{
+ struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource);
+
if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL))
- surface_load_location(rt, context, rtv->resource->draw_binding);
+ wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding);
else
- wined3d_texture_prepare_location(rt->container, rtv->sub_resource_idx,
- context, rtv->resource->draw_binding);
+ wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding);
}
}
More information about the wine-cvs
mailing list