Skip to content

W
wine-cw
Commit 8c30612d authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Use the texture dimension helpers in surface_load_location().

Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c4f7bdcf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
dlls/wined3d/surface.c
View file @ 8c30612d
......@@ -3219,14 +3219,17 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co
unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface);
struct wined3d_texture *texture = surface->container;
struct wined3d_texture_sub_resource *sub_resource;
unsigned int surface_w, surface_h;
HRESULT hr;
TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location));
surface_w = wined3d_texture_get_level_width(texture, surface->texture_level);
surface_h = wined3d_texture_get_level_height(texture, surface->texture_level);
sub_resource = &texture->sub_resources[sub_resource_idx];
if (sub_resource->locations & location && (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
|| (surface->ds_current_size.cx == surface->resource.width
&& surface->ds_current_size.cy == surface->resource.height)))
|| (surface->ds_current_size.cx == surface_w && surface->ds_current_size.cy == surface_h)))
{
TRACE("Location (%#x) is already up to date.\n", location);
return WINED3D_OK;
......@@ -3306,8 +3309,8 @@ done:
if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
surface->ds_current_size.cx = surface->resource.width;
surface->ds_current_size.cy = surface->resource.height;
surface->ds_current_size.cx = surface_w;
surface->ds_current_size.cy = surface_h;
}
if (location != WINED3D_LOCATION_SYSMEM && (sub_resource->locations & WINED3D_LOCATION_SYSMEM))
......
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