wined3d: Use wined3d_texture_blt() in surface_upload_from_surface().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-03-07 08:57:25 +01:00 committed by Alexandre Julliard
parent 71a0733052
commit aaa431d8a8
1 changed files with 3 additions and 2 deletions

View File

@ -1098,9 +1098,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
return WINED3DERR_INVALIDCALL;
}
/* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */
/* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */
if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_texture, FALSE))
return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT);
return wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect,
src_texture, src_sub_resource_idx, src_rect, 0, NULL, WINED3D_TEXF_POINT);
context = context_acquire(dst_texture->resource.device, NULL, 0);
gl_info = context->gl_info;