ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass a wined3d_context_gl structure to find_glsl_vshader(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-06-28 14:54:20 +04:30 committed by Alexandre Julliard
parent 6bf34c8366
commit e867d986d5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/glsl_shader.c
View File

@ -8470,12 +8470,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str
return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode)); return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode));
} }
static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_gl,
struct wined3d_shader *shader, const struct vs_compile_args *args) struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct vs_compile_args *args)
{ {
const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context);
struct glsl_vs_compiled_shader *gl_shaders, *new_array; struct glsl_vs_compiled_shader *gl_shaders, *new_array;
uint32_t use_map = context->stream_info.use_map; uint32_t use_map = context_gl->c.stream_info.use_map;
struct glsl_shader_private *shader_data; struct glsl_shader_private *shader_data;
unsigned int i, new_size; unsigned int i, new_size;
GLuint ret; GLuint ret;
@ -10134,7 +10133,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX];
find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context); find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context);
vs_id = find_glsl_vshader(context, priv, vshader, &vs_compile_args); vs_id = find_glsl_vertex_shader(context_gl, priv, vshader, &vs_compile_args);
vs_list = &vshader->linked_programs; vs_list = &vshader->linked_programs;
} }
else if (priv->vertex_pipe == &glsl_vertex_pipe) else if (priv->vertex_pipe == &glsl_vertex_pipe)