OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: remove remaining tabs from ast_type.cpp

Browse Source 
Acked-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Timothy Arceri
2016-09-28 16:04:09 +10:00
parent 222f66a812
commit 577e06095b
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/compiler/glsl/ast_type.cpp
View File

@@ -114,7 +114,7 @@ ast_type_qualifier::has_auxiliary_storage() const
*/ */
bool bool
ast_type_qualifier::merge_qualifier(YYLTYPE *loc, ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
_mesa_glsl_parse_state *state, _mesa_glsl_parse_state *state,
const ast_type_qualifier &q, const ast_type_qualifier &q,
bool is_single_layout_merge) 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() && if (is_single_layout_merge && !state->has_enhanced_layouts() &&
(this->flags.i & q.flags.i & ~allowed_duplicates_mask.flags.i) != 0) { (this->flags.i & q.flags.i & ~allowed_duplicates_mask.flags.i) != 0) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "duplicate layout qualifiers used");
"duplicate layout qualifiers used");
return false; return false;
} }
if (q.flags.q.prim_type) { if (q.flags.q.prim_type) {
if (this->flags.q.prim_type && this->prim_type != q.prim_type) { if (this->flags.q.prim_type && this->prim_type != q.prim_type) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
"conflicting primitive type qualifiers used"); "conflicting primitive type qualifiers used");
return false; return false;
} }
this->prim_type = q.prim_type; this->prim_type = q.prim_type;
} }
@@ -206,8 +205,8 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
if (q.flags.q.subroutine_def) { if (q.flags.q.subroutine_def) {
if (this->flags.q.subroutine_def) { if (this->flags.q.subroutine_def) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
"conflicting subroutine qualifiers used"); "conflicting subroutine qualifiers used");
} else { } else {
this->subroutine_list = q.subroutine_list; this->subroutine_list = q.subroutine_list;
} }
@@ -284,27 +283,24 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
if (q.flags.q.vertex_spacing) { if (q.flags.q.vertex_spacing) {
if (this->flags.q.vertex_spacing && this->vertex_spacing != q.vertex_spacing) { if (this->flags.q.vertex_spacing && this->vertex_spacing != q.vertex_spacing) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "conflicting vertex spacing used");
"conflicting vertex spacing used"); return false;
return false;
} }
this->vertex_spacing = q.vertex_spacing; this->vertex_spacing = q.vertex_spacing;
} }
if (q.flags.q.ordering) { if (q.flags.q.ordering) {
if (this->flags.q.ordering && this->ordering != q.ordering) { if (this->flags.q.ordering && this->ordering != q.ordering) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "conflicting ordering used");
"conflicting ordering used"); return false;
return false;
} }
this->ordering = q.ordering; this->ordering = q.ordering;
} }
if (q.flags.q.point_mode) { if (q.flags.q.point_mode) {
if (this->flags.q.point_mode && this->point_mode != q.point_mode) { if (this->flags.q.point_mode && this->point_mode != q.point_mode) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "conflicting point mode used");
"conflicting point mode used"); return false;
return false;
} }
this->point_mode = q.point_mode; this->point_mode = q.point_mode;
} }
@@ -328,8 +324,7 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
if (this->flags.q.in && if (this->flags.q.in &&
(this->flags.i & ~input_layout_mask.flags.i) != 0) { (this->flags.i & ~input_layout_mask.flags.i) != 0) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "invalid input layout qualifier used");
"invalid input layout qualifier used");
return false; return false;
} }
@@ -428,8 +423,7 @@ ast_type_qualifier::merge_out_qualifier(YYLTYPE *loc,
/* Generate an error when invalid input layout qualifiers are used. */ /* Generate an error when invalid input layout qualifiers are used. */
if ((q.flags.i & ~valid_out_mask.flags.i) != 0) { if ((q.flags.i & ~valid_out_mask.flags.i) != 0) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "invalid output layout qualifiers used");
"invalid output layout qualifiers used");
return false; return false;
} }
@@ -513,8 +507,7 @@ ast_type_qualifier::merge_in_qualifier(YYLTYPE *loc,
/* Generate an error when invalid input layout qualifiers are used. */ /* Generate an error when invalid input layout qualifiers are used. */
if ((q.flags.i & ~valid_in_mask.flags.i) != 0) { if ((q.flags.i & ~valid_in_mask.flags.i) != 0) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state, "invalid input layout qualifiers used");
"invalid input layout qualifiers used");
return false; return false;
} }