Henri Verbeet : wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 4a6314363ed61cf65fa0ea07ed80c627018f554c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4a6314363ed61cf65fa0ea07e...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Mar 27 15:46:32 2019 +0430

wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter.

Astutely spotted by Józef Kucia.
This fixes a regression introduced by commit
961a94ac046644004718c56bfeeb81740cb73793.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit a5279a5fba452d779cafc2cbd3098e9ed81598d9)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/wined3d/arb_program_shader.c | 1 +
 dlls/wined3d/glsl_shader.c        | 1 +
 dlls/wined3d/surface.c            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 37ec7e9..6dafdfd 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7839,6 +7839,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
                 src_texture, src_sub_resource_idx, &upload_box);
 
         src_texture = staging_texture;
+        src_texture_gl = wined3d_texture_gl(src_texture);
         src_sub_resource_idx = 0;
     }
     else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index db6760e..6f3826f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -13228,6 +13228,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
                 src_texture, src_sub_resource_idx, &upload_box);
 
         src_texture = staging_texture;
+        src_texture_gl = wined3d_texture_gl(src_texture);
         src_sub_resource_idx = 0;
     }
     else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0ee2f82..66253c2 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2220,6 +2220,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
                 src_texture, src_sub_resource_idx, &upload_box);
 
         src_texture = staging_texture;
+        src_texture_gl = wined3d_texture_gl(src_texture);
         src_sub_resource_idx = 0;
     }
     else