Skip to content

W
wine-winehq
Commit ec04b2e3 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

wined3d: Reduce nesting in texture2d_load_sysmem().

Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 14678ce7
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
dlls/wined3d/surface.c
View file @ ec04b2e3
......@@ -198,7 +198,6 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
else
wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location);
if (src_location == WINED3D_LOCATION_DRAWABLE)
{
required_texture = src_texture;
......@@ -1655,8 +1654,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res
WINED3D_LOCATION_RB_RESOLVED, dst_location);
return TRUE;
}
else
{
if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED))
wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
......@@ -1667,10 +1665,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res
!(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB));
texture2d_download_data(texture, sub_resource_idx, context, dst_location);
++texture->download_count;
return TRUE;
}
}
if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
&& (sub_resource->locations & WINED3D_LOCATION_DRAWABLE))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment