Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader().
Alexandre Julliard
julliard at winehq.org
Mon Jul 1 15:15:14 CDT 2019
Module: wine
Branch: master
Commit: 6bf34c8366e9c82d59de6859749fd716fdd86842
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bf34c8366e9c82d59de6859749fd716fdd86842
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jun 28 15:12:19 2019 +0430
wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 2ed5e7a..3aa31c1 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8373,12 +8373,11 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g
return shader_id;
}
-static GLuint find_glsl_pshader(const struct wined3d_context *context,
+static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context_gl,
struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers,
struct wined3d_shader *shader,
const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info)
{
- const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context);
struct glsl_ps_compiled_shader *gl_shaders, *new_array;
struct glsl_shader_private *shader_data;
struct ps_np2fixup_info *np2fixup;
@@ -10200,7 +10199,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
struct ps_compile_args ps_compile_args;
pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL];
find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, context);
- ps_id = find_glsl_pshader(context, &priv->shader_buffer, &priv->string_buffers,
+ ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers,
pshader, &ps_compile_args, &np2fixup_info);
ps_list = &pshader->linked_programs;
}
More information about the wine-cvs
mailing list