Module: wine Branch: master Commit: a5279a5fba452d779cafc2cbd3098e9ed81598d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5279a5fba452d779cafc2cbd...
Author: Henri Verbeet hverbeet@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@codeweavers.com Signed-off-by: Alexandre Julliard julliard@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 05bd55a..92c6e47 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7841,6 +7841,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 55d99ab..5844b0c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13258,6 +13258,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 11d0255..48ca35b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2213,6 +2213,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