Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_device_update_texture().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cf8ccb865dc1677df5599daaf238bd8c19630eaf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cf8ccb865dc1677df5599daaf2...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Mar 31 22:48:51 2016 +0200

wined3d: Avoid surface_from_resource() in wined3d_device_update_texture().

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/device.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d81bb70..35bf521 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3666,10 +3666,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
             {
                 for (j = 0; j < level_count; ++j)
                 {
-                    src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture,
-                            i * src_levels + j + src_skip_levels));
-                    dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture,
-                            i * dst_levels + j));
+                    src_surface = src_texture->sub_resources[i * src_levels + j + src_skip_levels].u.surface;
+                    dst_surface = dst_texture->sub_resources[i * dst_levels + j].u.surface;
                     if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL)))
                     {
                         WARN("Failed to update surface, hr %#x.\n", hr);