diff options
| author | Andres Gomez <[email protected]> | 2016-10-22 17:13:16 +0300 |
|---|---|---|
| committer | Andres Gomez <[email protected]> | 2016-11-25 13:18:31 +0200 |
| commit | 2a47c83d7e15cf8708dd148dbe15f87e575a2810 (patch) | |
| tree | e22d125cd7324008358b8b63e23d3a49e9b48884 /src/compiler/glsl/ast.h | |
| parent | e5041c64094255fae6ca7327cfd75a7595442478 (diff) | |
Revert "glsl: geom shader max_vertices layout must match."
This reverts commit 4c863993780a11cea6f88fa0682796bee5794042.
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 <[email protected]>
Signed-off-by: Andres Gomez <[email protected]>
Diffstat (limited to 'src/compiler/glsl/ast.h')
| -rw-r--r-- | src/compiler/glsl/ast.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/glsl/ast.h b/src/compiler/glsl/ast.h index d8b425c5981..afe91ea6d32 100644 --- a/src/compiler/glsl/ast.h +++ b/src/compiler/glsl/ast.h @@ -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) { |