Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to arbfp_blit_set().

Alexandre Julliard julliard at winehq.org
Tue Jun 4 16:28:12 CDT 2019


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Jun  4 15:49:51 2019 +0430

wined3d: Pass a wined3d_context_gl structure to arbfp_blit_set().

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

---

 dlls/wined3d/arb_program_shader.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 05c4519..e6546ab 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7548,11 +7548,10 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons
 }
 
 /* Context activation is done by the caller. */
-static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context *context,
+static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context_gl *context_gl,
         const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx,
         const struct wined3d_color_key *color_key)
 {
-    struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
     const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
     enum complex_fixup fixup;
     struct wine_rb_entry *entry;
@@ -7913,7 +7912,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
         color_key = &alpha_test_key;
     }
 
-    arbfp_blit_set(arbfp_blitter, context, src_texture_gl, src_sub_resource_idx, color_key);
+    arbfp_blit_set(arbfp_blitter, context_gl, src_texture_gl, src_sub_resource_idx, color_key);
 
     /* Draw a textured quad */
     context_draw_textured_quad(context, src_texture_gl,




More information about the wine-cvs mailing list