diff options
| author | Samuel Pitoiset <[email protected]> | 2017-03-01 00:31:20 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-03-01 14:15:31 +0100 |
| commit | be8aa76afd2cc5326c9d9d59c591e06365c5f618 (patch) | |
| tree | 2bbe816e736d16e0ced829c047be0e4d20657537 /src/compiler/glsl/ast_to_hir.cpp | |
| parent | ca7d2025a7547275101efbca0b45adb67f8fa59d (diff) | |
glsl: remove unecessary flags.q.subroutine_def
This bit is definitely not necessary because subroutine_list
can be used instead. This frees one more bit in the flags.q
struct which is nice because arb_bindless_texture will need
4 bits for the new layout qualifiers.
No piglit regressions found (including compiler tests) with
"-t subroutine".
v2: set the subroutine flag for validating illegal flags
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/compiler/glsl/ast_to_hir.cpp')
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 0c00585a050..a90813033fb 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -3510,7 +3510,7 @@ apply_layout_qualifier_to_variable(const struct ast_type_qualifier *qual, } } } else if (qual->flags.q.explicit_index) { - if (!qual->flags.q.subroutine_def) + if (!qual->subroutine_list) _mesa_glsl_error(loc, state, "explicit index requires explicit location"); } else if (qual->flags.q.explicit_component) { @@ -5576,7 +5576,7 @@ ast_function::hir(exec_list *instructions, * "Subroutine declarations cannot be prototyped. It is an error to prepend * subroutine(...) to a function declaration." */ - if (this->return_type->qualifier.flags.q.subroutine_def && !is_definition) { + if (this->return_type->qualifier.subroutine_list && !is_definition) { YYLTYPE loc = this->get_location(); _mesa_glsl_error(&loc, state, "function declaration `%s' cannot have subroutine prepended", @@ -5724,7 +5724,7 @@ ast_function::hir(exec_list *instructions, sig->replace_parameters(&hir_parameters); signature = sig; - if (this->return_type->qualifier.flags.q.subroutine_def) { + if (this->return_type->qualifier.subroutine_list) { int idx; if (this->return_type->qualifier.flags.q.explicit_index) { |