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/glsl_parser_extras.cpp | |
| 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/glsl_parser_extras.cpp')
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 78f7fe25965..1e0298eb84e 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1744,7 +1744,7 @@ set_shader_inout_layout(struct gl_shader *shader, unsigned qual_max_vertices; if (state->out_qualifier->max_vertices-> process_qualifier_constant(state, "max_vertices", - &qual_max_vertices, true, true)) { + &qual_max_vertices, true)) { if (qual_max_vertices > state->Const.MaxGeometryOutputVertices) { YYLTYPE loc = state->out_qualifier->max_vertices->get_location(); |