Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
Alexandre Julliard
julliard at winehq.org
Thu Jul 4 15:53:47 CDT 2019
Module: wine
Branch: master
Commit: 14f1cc73e7a5e6b5a790d6bbe94e4179fb203821
URL: https://source.winehq.org/git/wine.git/?a=commit;h=14f1cc73e7a5e6b5a790d6bbe94e4179fb203821
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Jul 4 16:46:00 2019 +0430
wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 0c6b6b6..e8357f8 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter,
/* Context activation is done by the caller. */
static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter,
- struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key)
+ struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key)
{
- const struct wined3d_gl_info *gl_info = context->gl_info;
+ const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
struct glsl_blitter_program *program;
struct glsl_blitter_args args;
struct wine_rb_entry *entry;
@@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
colour_key = NULL;
}
- if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key)))
+ if (!(program = glsl_blitter_get_program(glsl_blitter, context_gl, src_texture_gl, !!colour_key)))
{
ERR("Failed to get blitter program.\n");
return dst_location;
More information about the wine-cvs
mailing list