=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Use wined3d_texture_prepare_location() in surface_load_location().
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Apr 27 10:45:42 CDT 2016
Module: wine
Branch: master
Commit: fdd9a4cb929f084187bbea64eca8968a9bfd838f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd9a4cb929f084187bbea64eca8968a9bfd838f
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Tue Apr 26 17:56:03 2016 +0200
wined3d: Use wined3d_texture_prepare_location() in surface_load_location().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/surface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index a1c125a..c3c028c 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3068,7 +3068,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co
if (sub_resource->locations & WINED3D_LOCATION_DISCARDED)
{
TRACE("Surface previously discarded, nothing to do.\n");
- wined3d_surface_prepare(surface, context, location);
+ wined3d_texture_prepare_location(texture, sub_resource_idx, context, location);
wined3d_texture_validate_location(texture, sub_resource_idx, location);
wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED);
goto done;
More information about the wine-cvs
mailing list