Revert "glsl: geom shader max_vertices layout must match."

This reverts commit 4c86399378.

The commit was erroneous because the ast_layout_expression class was
created to hold a list of values for a layout-qualifier-name which is
allowed to appear in more than one expression in the same
shader/program but not to hold different values.

In other words, the list is used for an after check that all the
declared values for a layout-qualifier-name are consistent.

Therefore, the values stored must match always, not just for
"max_vertices" or any other eventual layout-qualifier-name.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
This commit is contained in:
Andres Gomez
2016-10-22 17:13:16 +03:00
parent e5041c6409
commit 2a47c83d7e
3 changed files with 9 additions and 13 deletions

View File

@@ -377,8 +377,7 @@ public:
bool process_qualifier_constant(struct _mesa_glsl_parse_state *state,
const char *qual_indentifier,
unsigned *value, bool can_be_zero,
bool must_match = false);
unsigned *value, bool can_be_zero);
void merge_qualifier(ast_layout_expression *l_expr)
{