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

wined3d: Pass a wined3d_context structure to texture2d_download_data(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Matteo Bruni 2018-03-08 10:35:04 +03:30 committed by Alexandre Julliard
parent 40d5908854
commit d2e89d0b99
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/surface.c
View File

@ -561,9 +561,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win
* correct texture. */
/* Context activation is done by the caller. */
static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
const struct wined3d_gl_info *gl_info, DWORD dst_location)
const struct wined3d_context *context, DWORD dst_location)
{
const struct wined3d_format *format = texture->resource.format;
const struct wined3d_gl_info *gl_info = context->gl_info;
struct wined3d_texture_sub_resource *sub_resource;
unsigned int dst_row_pitch, dst_slice_pitch;
unsigned int src_row_pitch, src_slice_pitch;
@ -2070,7 +2071,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx,
struct wined3d_context *context, DWORD dst_location)
{
const struct wined3d_gl_info *gl_info = context->gl_info;
struct wined3d_texture_sub_resource *sub_resource;
sub_resource = &texture->sub_resources[sub_resource_idx];
@ -2094,7 +2094,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res
{
wined3d_texture_bind_and_dirtify(texture, context,
!(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB));
texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location);
texture2d_download_data(texture, sub_resource_idx, context, dst_location);
++texture->download_count;
return TRUE;