diff options
| -rw-r--r-- | src/compiler/glsl/ast_type.cpp | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp index f3f6b29369b..b586f94c1a8 100644 --- a/src/compiler/glsl/ast_type.cpp +++ b/src/compiler/glsl/ast_type.cpp @@ -114,7 +114,7 @@ ast_type_qualifier::has_auxiliary_storage() const */ bool ast_type_qualifier::merge_qualifier(YYLTYPE *loc, - _mesa_glsl_parse_state *state, + _mesa_glsl_parse_state *state, const ast_type_qualifier &q, bool is_single_layout_merge) { @@ -182,16 +182,15 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc, if (is_single_layout_merge && !state->has_enhanced_layouts() && (this->flags.i & q.flags.i & ~allowed_duplicates_mask.flags.i) != 0) { - _mesa_glsl_error(loc, state, - "duplicate layout qualifiers used"); + _mesa_glsl_error(loc, state, "duplicate layout qualifiers used"); return false; } if (q.flags.q.prim_type) { if (this->flags.q.prim_type && this->prim_type != q.prim_type) { - _mesa_glsl_error(loc, state, - "conflicting primitive type qualifiers used"); - return false; + _mesa_glsl_error(loc, state, + "conflicting primitive type qualifiers used"); + return false; } this->prim_type = q.prim_type; } @@ -206,8 +205,8 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc, if (q.flags.q.subroutine_def) { if (this->flags.q.subroutine_def) { - _mesa_glsl_error(loc, state, - "conflicting subroutine qualifiers used"); + _mesa_glsl_error(loc, state, + "conflicting subroutine qualifiers used"); } else { this->subroutine_list = q.subroutine_list; } @@ -284,27 +283,24 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc, if (q.flags.q.vertex_spacing) { if (this->flags.q.vertex_spacing && this->vertex_spacing != q.vertex_spacing) { - _mesa_glsl_error(loc, state, - "conflicting vertex spacing used"); - return false; + _mesa_glsl_error(loc, state, "conflicting vertex spacing used"); + return false; } this->vertex_spacing = q.vertex_spacing; } if (q.flags.q.ordering) { if (this->flags.q.ordering && this->ordering != q.ordering) { - _mesa_glsl_error(loc, state, - "conflicting ordering used"); - return false; + _mesa_glsl_error(loc, state, "conflicting ordering used"); + return false; } this->ordering = q.ordering; } if (q.flags.q.point_mode) { if (this->flags.q.point_mode && this->point_mode != q.point_mode) { - _mesa_glsl_error(loc, state, - "conflicting point mode used"); - return false; + _mesa_glsl_error(loc, state, "conflicting point mode used"); + return false; } this->point_mode = q.point_mode; } @@ -328,8 +324,7 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc, if (this->flags.q.in && (this->flags.i & ~input_layout_mask.flags.i) != 0) { - _mesa_glsl_error(loc, state, - "invalid input layout qualifier used"); + _mesa_glsl_error(loc, state, "invalid input layout qualifier used"); return false; } @@ -428,8 +423,7 @@ ast_type_qualifier::merge_out_qualifier(YYLTYPE *loc, /* Generate an error when invalid input layout qualifiers are used. */ if ((q.flags.i & ~valid_out_mask.flags.i) != 0) { - _mesa_glsl_error(loc, state, - "invalid output layout qualifiers used"); + _mesa_glsl_error(loc, state, "invalid output layout qualifiers used"); return false; } @@ -513,8 +507,7 @@ ast_type_qualifier::merge_in_qualifier(YYLTYPE *loc, /* Generate an error when invalid input layout qualifiers are used. */ if ((q.flags.i & ~valid_in_mask.flags.i) != 0) { - _mesa_glsl_error(loc, state, - "invalid input layout qualifiers used"); + _mesa_glsl_error(loc, state, "invalid input layout qualifiers used"); return false; } |