Commit bdfee157 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Use wined3d_texture_load_location() in surface_load_texture().

parent 1091de5c
...@@ -2908,7 +2908,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, ...@@ -2908,7 +2908,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
== WINED3D_LOCATION_TEXTURE_RGB) == WINED3D_LOCATION_TEXTURE_RGB)
{ {
FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface); FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface);
surface_load_location(surface, context, texture->resource.map_binding); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding);
} }
} }
else else
...@@ -2917,7 +2917,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, ...@@ -2917,7 +2917,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
== WINED3D_LOCATION_TEXTURE_SRGB) == WINED3D_LOCATION_TEXTURE_SRGB)
{ {
FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface); FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface);
surface_load_location(surface, context, texture->resource.map_binding); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding);
} }
} }
...@@ -2925,7 +2925,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, ...@@ -2925,7 +2925,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{ {
WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); WARN("Trying to load a texture from sysmem, but no simple location is valid.\n");
/* Lets hope we get it from somewhere... */ /* Lets hope we get it from somewhere... */
surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM);
} }
wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_prepare_texture(texture, context, srgb);
...@@ -2943,7 +2943,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, ...@@ -2943,7 +2943,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{ {
TRACE("Removing the pbo attached to surface %p.\n", surface); TRACE("Removing the pbo attached to surface %p.\n", surface);
surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM);
wined3d_texture_set_map_binding(texture, WINED3D_LOCATION_SYSMEM); wined3d_texture_set_map_binding(texture, 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