Module: wine Branch: master Commit: 9083addc6a49e64ea011b53ce6ce06fc3e0d8181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9083addc6a49e64ea011b53ce6...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Sun Mar 6 20:59:48 2016 +0100
wined3d: Get resource info from the rendertarget view in draw_primitive().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/drawprim.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ff62850..c95f92d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -622,17 +622,19 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co
for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(device->fb.render_targets[i]); - if (target && target->resource.format->id != WINED3DFMT_NULL) + struct wined3d_rendertarget_view *rtv = device->fb.render_targets[i]; + struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); + + if (target && rtv->format->id != WINED3DFMT_NULL) { if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { - surface_load_location(target, context, target->container->resource.draw_binding); - surface_invalidate_location(target, ~target->container->resource.draw_binding); + surface_load_location(target, context, rtv->resource->draw_binding); + surface_invalidate_location(target, ~rtv->resource->draw_binding); } else { - wined3d_surface_prepare(target, context, target->container->resource.draw_binding); + wined3d_surface_prepare(target, context, rtv->resource->draw_binding); } } }