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

wined3d: Use wined3d_texture_get_level_box() in texture2d_load_texture(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-05-19 18:30:47 +04:30 committed by Alexandre Julliard
parent 6cd822c38a
commit 916bd0e4c2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wined3d/surface.c
View File

@ -1548,9 +1548,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re
} }
level = sub_resource_idx % texture->level_count; level = sub_resource_idx % texture->level_count;
width = wined3d_texture_get_level_width(texture, level); wined3d_texture_get_level_box(texture, level, &src_box);
height = wined3d_texture_get_level_height(texture, level);
wined3d_box_set(&src_box, 0, 0, width, height, 0, 1);
if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB)
&& (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)
@ -1560,7 +1558,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re
{ {
RECT src_rect; RECT src_rect;
SetRect(&src_rect, 0, 0, width, height); SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom);
if (srgb) if (srgb)
texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT,
texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect,
@ -1581,7 +1579,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re
DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB;
RECT src_rect; RECT src_rect;
SetRect(&src_rect, 0, 0, width, height); SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom);
if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info,
&texture->resource, src_location, &texture->resource, dst_location)) &texture->resource, src_location, &texture->resource, dst_location))
texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx,
@ -1640,6 +1638,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re
wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations);
if (conversion) if (conversion)
{ {
width = src_box.right - src_box.left;
height = src_box.bottom - src_box.top;
wined3d_format_calculate_pitch(format, device->surface_alignment, wined3d_format_calculate_pitch(format, device->surface_alignment,
width, height, &dst_row_pitch, &dst_slice_pitch); width, height, &dst_row_pitch, &dst_slice_pitch);