From 4c863993780a11cea6f88fa0682796bee5794042 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 3 Jun 2016 10:45:07 +1000 Subject: glsl: geom shader max_vertices layout must match. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From GLSL 4.5 spec, "4.4.2.3 Geometry Outputs". "all geometry shader output vertex count declarations in a program must declare the same count." Fixes: GL45-CTS.geometry_shader.output.conflicted_output_vertices_max Reviewed-by: Alejandro Piñeiro Cc: "11.2 12.0" Signed-off-by: Dave Airlie --- src/compiler/glsl/ast.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/compiler/glsl/ast.h') diff --git a/src/compiler/glsl/ast.h b/src/compiler/glsl/ast.h index ca98ed2834d..06c7b032a79 100644 --- a/src/compiler/glsl/ast.h +++ b/src/compiler/glsl/ast.h @@ -368,7 +368,8 @@ public: bool process_qualifier_constant(struct _mesa_glsl_parse_state *state, const char *qual_indentifier, - unsigned *value, bool can_be_zero); + unsigned *value, bool can_be_zero, + bool must_match = false); void merge_qualifier(ast_layout_expression *l_expr) { -- cgit v1.2.3