Commit 62d6520f authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader().

parent 95be042b
...@@ -8533,10 +8533,9 @@ static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_g ...@@ -8533,10 +8533,9 @@ static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_g
return ret; return ret;
} }
static GLuint find_glsl_hull_shader(const struct wined3d_context *context, static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl,
struct shader_glsl_priv *priv, struct wined3d_shader *shader) struct shader_glsl_priv *priv, struct wined3d_shader *shader)
{ {
const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context);
struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_hs_compiled_shader *gl_shaders, *new_array;
struct glsl_shader_private *shader_data; struct glsl_shader_private *shader_data;
unsigned int new_size; unsigned int new_size;
...@@ -10151,7 +10150,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const ...@@ -10151,7 +10150,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program)
hs_id = ctx_data->glsl_program->hs.id; hs_id = ctx_data->glsl_program->hs.id;
else if (hshader) else if (hshader)
hs_id = find_glsl_hull_shader(context, priv, hshader); hs_id = find_glsl_hull_shader(context_gl, priv, hshader);
dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN];
if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program)
......
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