wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
c85df2edc6
commit
eaf48206c1
|
@ -8013,14 +8013,13 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b
|
|||
}
|
||||
}
|
||||
|
||||
static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context,
|
||||
static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl *context_gl,
|
||||
struct shader_glsl_priv *priv, const struct wined3d_shader *shader)
|
||||
{
|
||||
const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context);
|
||||
struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers;
|
||||
const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;
|
||||
const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
|
||||
struct wined3d_string_buffer *buffer = &priv->shader_buffer;
|
||||
const struct wined3d_gl_info *gl_info = context->gl_info;
|
||||
const struct wined3d_hull_shader *hs = &shader->u.hs;
|
||||
const struct wined3d_shader_phase *phase;
|
||||
struct shader_glsl_ctx_priv priv_ctx;
|
||||
|
@ -8542,6 +8541,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh
|
|||
static GLuint find_glsl_hull_shader(const struct wined3d_context *context,
|
||||
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_shader_private *shader_data;
|
||||
unsigned int new_size;
|
||||
|
@ -8578,7 +8578,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context,
|
|||
gl_shaders = new_array;
|
||||
|
||||
string_buffer_clear(&priv->shader_buffer);
|
||||
ret = shader_glsl_generate_hull_shader(context, priv, shader);
|
||||
ret = shader_glsl_generate_hull_shader(context_gl, priv, shader);
|
||||
gl_shaders[shader_data->num_gl_shaders++].id = ret;
|
||||
|
||||
return ret;
|
||||
|
|
Loading…
Reference in New Issue