Commit 14f1cc73 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().

parent 48d710dc
...@@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, ...@@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter,
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, 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_program *program;
struct glsl_blitter_args args; struct glsl_blitter_args args;
struct wine_rb_entry *entry; struct wine_rb_entry *entry;
...@@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli ...@@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
colour_key = NULL; 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"); ERR("Failed to get blitter program.\n");
return dst_location; return dst_location;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment