Henri Verbeet : wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eb5afc560cd87a5470a06b42eb36e4b619974eaf
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=eb5afc560cd87a5470a06b42e...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Jun 13 16:28:39 2019 +0430

wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture().

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

---

 dlls/wined3d/texture.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 3f6d620..71bec04 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -3850,15 +3850,15 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un
         wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
     else
         wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
-    wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE);
 
     src_level = src_sub_resource_idx % src_texture->level_count;
     wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data,
             src_texture->sub_resources[src_sub_resource_idx].locations);
     wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch);
 
-    wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_texture->resource.format,
-            src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, FALSE);
+    dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data),
+            src_texture->resource.format, src_box, src_row_pitch, src_slice_pitch, dst_texture,
+            dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, dst_x, dst_y, dst_z);
 
     context_release(context);