Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader().
Alexandre Julliard
julliard at winehq.org
Tue Jul 2 15:32:01 CDT 2019
Module: wine
Branch: master
Commit: 9d7ca718e083894899fb1b48beec0ebb2407ddab
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7ca718e083894899fb1b48beec0ebb2407ddab
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Jul 2 02:28:33 2019 +0430
wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader().
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 a34de17..e6fe783 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8633,10 +8633,9 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_g
return ret;
}
-static GLuint find_glsl_geometry_shader(const struct wined3d_context *context,
+static GLuint find_glsl_geometry_shader(const struct wined3d_context_gl *context_gl,
struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args)
{
- const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context);
struct glsl_gs_compiled_shader *gl_shaders, *new_array;
struct glsl_shader_private *shader_data;
unsigned int i, new_size;
@@ -10174,7 +10173,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
struct gs_compile_args args;
find_gs_compile_args(state, gshader, &args, context);
- gs_id = find_glsl_geometry_shader(context, priv, gshader, &args);
+ gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args);
}
/* A pixel shader is not used when rasterization is disabled. */
More information about the wine-cvs
mailing list