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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Jun 12 16:17:35 2019 +0430

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

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 291ae84..8d67e52 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -694,9 +694,9 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
         TRACE("Using upload conversion.\n");
 
         wined3d_texture_prepare_location(dst_texture, 0, context, WINED3D_LOCATION_TEXTURE_RGB);
-        wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE);
-        wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box,
-                wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE);
+        dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&src_data),
+                src_format, &src_box, src_row_pitch, src_slice_pitch,
+                dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB, 0, 0, 0);
 
         wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB);
         wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB);