Module: wine Branch: master Commit: 620e2d671860799830e4d79ff19bb0a8f5fd9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620e2d671860799830e4d79ff1...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon May 8 09:48:02 2017 +0200
wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input().
We declare min(vec4_varyings(4, gl_info), input_count) shader outputs.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef6b759..20e1b0b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6791,8 +6791,9 @@ static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_p { struct wined3d_string_buffer *buffer = &priv->shader_buffer;
+ input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", min(vec4_varyings(4, gl_info), input_count)); + declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", input_count);
shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output);