diff options
| -rw-r--r-- | src/libs/glsl/glsl.g | 112 | ||||
| -rw-r--r-- | src/libs/glsl/glslast.cpp | 7 | ||||
| -rw-r--r-- | src/libs/glsl/glslast.h | 62 | ||||
| -rw-r--r-- | src/libs/glsl/glslastvisitor.h | 3 | ||||
| -rw-r--r-- | src/libs/glsl/glslparser.cpp | 737 | ||||
| -rw-r--r-- | src/libs/glsl/glslparser.h | 7 |
6 files changed, 536 insertions, 392 deletions
diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g index 416ca7c1ba..2bb9d2abbe 100644 --- a/src/libs/glsl/glsl.g +++ b/src/libs/glsl/glsl.g @@ -281,6 +281,13 @@ public: FunctionIdentifier *id; List<Expression *> *arguments; } function; + int qualifier; + LayoutQualifier *layout; + List<LayoutQualifier *> *layout_list; + struct { + int qualifier; + List<LayoutQualifier *> *layout_list; + } type_qualifier; // ### ast nodes... }; @@ -1392,231 +1399,241 @@ case $rule_number: { fully_specified_type ::= type_specifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + ast(1) = makeAstNode<QualifiedType>(0, type(1), (List<LayoutQualifier *> *)0); } break; ./ fully_specified_type ::= type_qualifier type_specifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + ast(1) = makeAstNode<QualifiedType> + (sym(1).type_qualifier.qualifier, type(2), + sym(1).type_qualifier.layout_list); } break; ./ invariant_qualifier ::= INVARIANT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Invariant; } break; ./ interpolation_qualifier ::= SMOOTH ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Smooth; } break; ./ interpolation_qualifier ::= FLAT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Flat; } break; ./ interpolation_qualifier ::= NOPERSPECTIVE ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::NoPerspective; } break; ./ layout_qualifier ::= LAYOUT LEFT_PAREN layout_qualifier_id_list RIGHT_PAREN ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1) = sym(3); } break; ./ layout_qualifier_id_list ::= layout_qualifier_id ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).layout_list = makeAstNode< List<LayoutQualifier *> >(sym(1).layout); } break; ./ layout_qualifier_id_list ::= layout_qualifier_id_list COMMA layout_qualifier_id ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).layout_list = makeAstNode< List<LayoutQualifier *> >(sym(1).layout_list, sym(3).layout); } break; ./ layout_qualifier_id ::= IDENTIFIER ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).layout = makeAstNode<LayoutQualifier>(string(1), (const std::string *)0); } break; ./ layout_qualifier_id ::= IDENTIFIER EQUAL NUMBER ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).layout = makeAstNode<LayoutQualifier>(string(1), string(3)); } break; ./ parameter_type_qualifier ::= CONST ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Const; } break; ./ type_qualifier ::= storage_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; ./ type_qualifier ::= layout_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = 0; } break; ./ type_qualifier ::= layout_qualifier storage_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = sym(2).qualifier; } break; ./ type_qualifier ::= interpolation_qualifier storage_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; ./ type_qualifier ::= interpolation_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; ./ type_qualifier ::= invariant_qualifier storage_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; ./ type_qualifier ::= invariant_qualifier interpolation_qualifier storage_qualifier ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; ./ type_qualifier ::= INVARIANT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = QualifiedType::Invariant; + sym(1).type_qualifier.layout_list = 0; } break; ./ storage_qualifier ::= CONST ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Const; } break; ./ storage_qualifier ::= ATTRIBUTE ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Attribute; } break; ./ storage_qualifier ::= VARYING ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Varying; } break; ./ storage_qualifier ::= CENTROID VARYING ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::CentroidVarying; } break; ./ storage_qualifier ::= IN ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::In; } break; ./ storage_qualifier ::= OUT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Out; } break; ./ storage_qualifier ::= CENTROID IN ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::CentroidIn; } break; ./ storage_qualifier ::= CENTROID OUT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::CentroidOut; } break; ./ storage_qualifier ::= PATCH IN ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::PatchIn; } break; ./ storage_qualifier ::= PATCH OUT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::PatchOut; } break; ./ storage_qualifier ::= SAMPLE IN ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::SampleIn; } break; ./ storage_qualifier ::= SAMPLE OUT ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::SampleOut; } break; ./ storage_qualifier ::= UNIFORM ; /. case $rule_number: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Uniform; } break; ./ @@ -2326,8 +2343,10 @@ case $rule_number: { struct_declaration ::= type_qualifier type_specifier struct_declarator_list SEMICOLON ; /. case $rule_number: { - // TODO: type qualifier - sym(1).field_list = StructType::fixInnerTypes(type(2), sym(3).field_list); + sym(1).field_list = StructType::fixInnerTypes + (makeAstNode<QualifiedType> + (sym(1).type_qualifier.qualifier, type(2), + sym(1).type_qualifier.layout_list), sym(3).field_list); } break; ./ @@ -2698,14 +2717,31 @@ case $rule_number: { external_declaration_list ::= external_declaration ; /. case $rule_number: { - sym(1).declaration_list = makeAstNode< List<Declaration *> >(sym(1).declaration); + if (sym(1).declaration) { + sym(1).declaration_list = makeAstNode< List<Declaration *> > + (sym(1).declaration); + } else { + sym(1).declaration_list = 0; + } } break; ./ external_declaration_list ::= external_declaration_list external_declaration ; /. case $rule_number: { - sym(1).declaration_list = makeAstNode< List<Declaration *> >(sym(1).declaration_list, sym(2).declaration); + if (sym(1).declaration_list && sym(2).declaration) { + sym(1).declaration_list = makeAstNode< List<Declaration *> > + (sym(1).declaration_list, sym(2).declaration); + } else if (!sym(1).declaration_list) { + if (sym(2).declaration) { + sym(1).declaration_list = makeAstNode< List<Declaration *> > + (sym(2).declaration); + } else { + sym(1).declaration_list = 0; + } + } else { + sym(1).declaration_list = 0; + } } break; ./ @@ -2726,7 +2762,7 @@ case $rule_number: { external_declaration ::= SEMICOLON ; /. case $rule_number: { - // ast(1) = new ...AST(...); + ast(1) = 0; } break; ./ diff --git a/src/libs/glsl/glslast.cpp b/src/libs/glsl/glslast.cpp index b627edefd1..08252d50a6 100644 --- a/src/libs/glsl/glslast.cpp +++ b/src/libs/glsl/glslast.cpp @@ -335,6 +335,13 @@ List<StructType::Field *> *StructType::fixInnerTypes(Type *innerType, List<Field return fields; } +void QualifiedType::accept0(Visitor *visitor) +{ + if (visitor->visit(this)) + accept(type, visitor); + visitor->endVisit(this); +} + void PrecisionDeclaration::accept0(Visitor *visitor) { if (visitor->visit(this)) diff --git a/src/libs/glsl/glslast.h b/src/libs/glsl/glslast.h index 482ae88463..74176f1443 100644 --- a/src/libs/glsl/glslast.h +++ b/src/libs/glsl/glslast.h @@ -63,6 +63,7 @@ class BasicType; class NamedType; class ArrayType; class StructType; +class QualifiedType; class Declaration; class PrecisionDeclaration; class Visitor; @@ -198,6 +199,7 @@ public: Kind_StructType, Kind_AnonymousStructType, Kind_StructField, + Kind_QualifiedType, // Declarations Kind_PrecisionDeclaration @@ -233,6 +235,7 @@ public: virtual NamedType *asNamedType() { return 0; } virtual ArrayType *asArrayType() { return 0; } virtual StructType *asStructType() { return 0; } + virtual QualifiedType *asQualifiedType() { return 0; } virtual Declaration *asDeclaration() { return 0; } virtual PrecisionDeclaration *asPrecisionDeclaration() { return 0; } @@ -755,6 +758,65 @@ public: // attributes List<Field *> *fields; }; +class GLSL_EXPORT LayoutQualifier +{ +public: + LayoutQualifier(const std::string *_name, const std::string *_number) + : name(_name), number(_number), lineno(0) {} + +public: // attributes + const std::string *name; + const std::string *number; + int lineno; +}; + +class GLSL_EXPORT QualifiedType: public Type +{ +public: + QualifiedType(int _qualifiers, Type *_type, List<LayoutQualifier *> *_layout_list) + : Type(Kind_QualifiedType), qualifiers(_qualifiers), type(_type) + , layout_list(_layout_list) {} + + enum + { + StorageMask = 0x000000FF, + NoStorage = 0x00000000, + Const = 0x00000001, + Attribute = 0x00000002, + Varying = 0x00000003, + CentroidVarying = 0x00000004, + In = 0x00000005, + Out = 0x00000006, + CentroidIn = 0x00000007, + CentroidOut = 0x00000008, + PatchIn = 0x00000009, + PatchOut = 0x0000000A, + SampleIn = 0x0000000B, + SampleOut = 0x0000000C, + Uniform = 0x0000000D, + InterpolationMask = 0x00000F00, + NoInterpolation = 0x00000000, + Smooth = 0x00000100, + Flat = 0x00000200, + NoPerspective = 0x00000300, + Invariant = 0x00010000 + }; + + virtual QualifiedType *asQualifiedType() { return this; } + + virtual void accept0(Visitor *visitor); + + virtual Precision precision() const { return type->precision(); } + virtual bool setPrecision(Precision precision) { return type->setPrecision(precision); } + + virtual Category category() const { return type->category(); } + +public: // attributes + int qualifiers; + Type *type; + List<LayoutQualifier *> *layout_list; +}; + class GLSL_EXPORT Declaration: public AST { protected: diff --git a/src/libs/glsl/glslastvisitor.h b/src/libs/glsl/glslastvisitor.h index 38d4a2363e..fc6300ab08 100644 --- a/src/libs/glsl/glslastvisitor.h +++ b/src/libs/glsl/glslastvisitor.h @@ -117,6 +117,9 @@ public: virtual bool visit(StructType::Field *) { return true; } virtual void endVisit(StructType::Field *) {} + virtual bool visit(QualifiedType *) { return true; } + virtual void endVisit(QualifiedType *) {} + virtual bool visit(PrecisionDeclaration *) { return true; } virtual void endVisit(PrecisionDeclaration *) {} }; diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp index 3ca57e8b13..0e79f21d75 100644 --- a/src/libs/glsl/glslparser.cpp +++ b/src/libs/glsl/glslparser.cpp @@ -1,5 +1,5 @@ -#line 367 "./glsl.g" +#line 374 "./glsl.g" /************************************************************************** ** @@ -159,137 +159,137 @@ TranslationUnit *Parser::parse() return 0; } -#line 529 "./glsl.g" +#line 536 "./glsl.g" void Parser::reduce(int ruleno) { switch(ruleno) { -#line 538 "./glsl.g" +#line 545 "./glsl.g" case 0: { ast(1) = makeAstNode<IdentifierExpression>(string(1)); } break; -#line 545 "./glsl.g" +#line 552 "./glsl.g" case 1: { ast(1) = makeAstNode<LiteralExpression>(string(1)); } break; -#line 552 "./glsl.g" +#line 559 "./glsl.g" case 2: { ast(1) = makeAstNode<LiteralExpression>(_engine->identifier("true", 4)); } break; -#line 559 "./glsl.g" +#line 566 "./glsl.g" case 3: { ast(1) = makeAstNode<LiteralExpression>(_engine->identifier("false", 5)); } break; -#line 566 "./glsl.g" +#line 573 "./glsl.g" case 4: { // nothing to do. } break; -#line 573 "./glsl.g" +#line 580 "./glsl.g" case 5: { ast(1) = ast(2); } break; -#line 580 "./glsl.g" +#line 587 "./glsl.g" case 6: { // nothing to do. } break; -#line 587 "./glsl.g" +#line 594 "./glsl.g" case 7: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_ArrayAccess, expression(1), expression(3)); } break; -#line 594 "./glsl.g" +#line 601 "./glsl.g" case 8: { // nothing to do. } break; -#line 601 "./glsl.g" +#line 608 "./glsl.g" case 9: { ast(1) = makeAstNode<MemberAccessExpression>(expression(1), string(3)); } break; -#line 608 "./glsl.g" +#line 615 "./glsl.g" case 10: { ast(1) = makeAstNode<UnaryExpression>(AST::Kind_PostIncrement, expression(1)); } break; -#line 615 "./glsl.g" +#line 622 "./glsl.g" case 11: { ast(1) = makeAstNode<UnaryExpression>(AST::Kind_PostDecrement, expression(1)); } break; -#line 622 "./glsl.g" +#line 629 "./glsl.g" case 12: { // nothing to do. } break; -#line 629 "./glsl.g" +#line 636 "./glsl.g" case 13: { // nothing to do. } break; -#line 636 "./glsl.g" +#line 643 "./glsl.g" case 14: { ast(1) = makeAstNode<FunctionCallExpression> (sym(1).function.id, sym(1).function.arguments); } break; -#line 644 "./glsl.g" +#line 651 "./glsl.g" case 15: { ast(1) = makeAstNode<FunctionCallExpression> (expression(1), sym(3).function.id, sym(3).function.arguments); } break; -#line 652 "./glsl.g" +#line 659 "./glsl.g" case 16: { // nothing to do. } break; -#line 659 "./glsl.g" +#line 666 "./glsl.g" case 17: { // nothing to do. } break; -#line 666 "./glsl.g" +#line 673 "./glsl.g" case 18: { sym(1).function.id = sym(1).function_identifier; sym(1).function.arguments = 0; } break; -#line 674 "./glsl.g" +#line 681 "./glsl.g" case 19: { sym(1).function.id = sym(1).function_identifier; sym(1).function.arguments = 0; } break; -#line 682 "./glsl.g" +#line 689 "./glsl.g" case 20: { sym(1).function.id = sym(1).function_identifier; @@ -297,7 +297,7 @@ case 20: { makeAstNode< List<Expression *> >(expression(2)); } break; -#line 691 "./glsl.g" +#line 698 "./glsl.g" case 21: { sym(1).function.arguments = @@ -305,805 +305,815 @@ case 21: { (sym(1).function.arguments, expression(3)); } break; -#line 700 "./glsl.g" +#line 707 "./glsl.g" case 22: { // nothing to do. } break; -#line 707 "./glsl.g" +#line 714 "./glsl.g" case 23: { ast(1) = makeAstNode<FunctionIdentifier>(type(1)); } break; -#line 714 "./glsl.g" +#line 721 "./glsl.g" case 24: { ast(1) = makeAstNode<FunctionIdentifier>(string(1)); } break; -#line 721 "./glsl.g" +#line 728 "./glsl.g" case 25: { // nothing to do. } break; -#line 728 "./glsl.g" +#line 735 "./glsl.g" case 26: { ast(1) = makeAstNode<UnaryExpression>(AST::Kind_PreIncrement, expression(1)); } break; -#line 735 "./glsl.g" +#line 742 "./glsl.g" case 27: { ast(1) = makeAstNode<UnaryExpression>(AST::Kind_PreDecrement, expression(1)); } break; -#line 742 "./glsl.g" +#line 749 "./glsl.g" case 28: { ast(1) = makeAstNode<UnaryExpression>(sym(1).kind, expression(2)); } break; -#line 749 "./glsl.g" +#line 756 "./glsl.g" case 29: { sym(1).kind = AST::Kind_UnaryPlus; } break; -#line 756 "./glsl.g" +#line 763 "./glsl.g" case 30: { sym(1).kind = AST::Kind_UnaryMinus; } break; -#line 763 "./glsl.g" +#line 770 "./glsl.g" case 31: { sym(1).kind = AST::Kind_LogicalNot; } break; -#line 770 "./glsl.g" +#line 777 "./glsl.g" case 32: { sym(1).kind = AST::Kind_BitwiseNot; } break; -#line 777 "./glsl.g" +#line 784 "./glsl.g" case 33: { // nothing to do. } break; -#line 784 "./glsl.g" +#line 791 "./glsl.g" case 34: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Multiply, expression(1), expression(3)); } break; -#line 791 "./glsl.g" +#line 798 "./glsl.g" case 35: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Divide, expression(1), expression(3)); } break; -#line 798 "./glsl.g" +#line 805 "./glsl.g" case 36: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Modulus, expression(1), expression(3)); } break; -#line 805 "./glsl.g" +#line 812 "./glsl.g" case 37: { // nothing to do. } break; -#line 812 "./glsl.g" +#line 819 "./glsl.g" case 38: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Plus, expression(1), expression(3)); } break; -#line 819 "./glsl.g" +#line 826 "./glsl.g" case 39: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Minus, expression(1), expression(3)); } break; -#line 826 "./glsl.g" +#line 833 "./glsl.g" case 40: { // nothing to do. } break; -#line 833 "./glsl.g" +#line 840 "./glsl.g" case 41: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_ShiftLeft, expression(1), expression(3)); } break; -#line 840 "./glsl.g" +#line 847 "./glsl.g" case 42: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_ShiftRight, expression(1), expression(3)); } break; -#line 847 "./glsl.g" +#line 854 "./glsl.g" case 43: { // nothing to do. } break; -#line 854 "./glsl.g" +#line 861 "./glsl.g" case 44: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_LessThan, expression(1), expression(3)); } break; -#line 861 "./glsl.g" +#line 868 "./glsl.g" case 45: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_GreaterThan, expression(1), expression(3)); } break; -#line 868 "./glsl.g" +#line 875 "./glsl.g" case 46: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_LessEqual, expression(1), expression(3)); } break; -#line 875 "./glsl.g" +#line 882 "./glsl.g" case 47: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_GreaterEqual, expression(1), expression(3)); } break; -#line 882 "./glsl.g" +#line 889 "./glsl.g" case 48: { // nothing to do. } break; -#line 889 "./glsl.g" +#line 896 "./glsl.g" case 49: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Equal, expression(1), expression(3)); } break; -#line 896 "./glsl.g" +#line 903 "./glsl.g" case 50: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_NotEqual, expression(1), expression(3)); } break; -#line 903 "./glsl.g" +#line 910 "./glsl.g" case 51: { // nothing to do. } break; -#line 910 "./glsl.g" +#line 917 "./glsl.g" case 52: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_BitwiseAnd, expression(1), expression(3)); } break; -#line 917 "./glsl.g" +#line 924 "./glsl.g" case 53: { // nothing to do. } break; -#line 924 "./glsl.g" +#line 931 "./glsl.g" case 54: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_BitwiseOr, expression(1), expression(3)); } break; -#line 931 "./glsl.g" +#line 938 "./glsl.g" case 55: { // nothing to do. } break; -#line 938 "./glsl.g" +#line 945 "./glsl.g" case 56: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_BitwiseXor, expression(1), expression(3)); } break; -#line 945 "./glsl.g" +#line 952 "./glsl.g" case 57: { // nothing to do. } break; -#line 952 "./glsl.g" +#line 959 "./glsl.g" case 58: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_LogicalAnd, expression(1), expression(3)); } break; -#line 959 "./glsl.g" +#line 966 "./glsl.g" case 59: { // nothing to do. } break; -#line 966 "./glsl.g" +#line 973 "./glsl.g" case 60: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_LogicalXor, expression(1), expression(3)); } break; -#line 973 "./glsl.g" +#line 980 "./glsl.g" case 61: { // nothing to do. } break; -#line 980 "./glsl.g" +#line 987 "./glsl.g" case 62: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_LogicalOr, expression(1), expression(3)); } break; -#line 987 "./glsl.g" +#line 994 "./glsl.g" case 63: { // nothing to do. } break; -#line 994 "./glsl.g" +#line 1001 "./glsl.g" case 64: { ast(1) = makeAstNode<TernaryExpression>(AST::Kind_Conditional, expression(1), expression(3), expression(5)); } break; -#line 1001 "./glsl.g" +#line 1008 "./glsl.g" case 65: { // nothing to do. } break; -#line 1008 "./glsl.g" +#line 1015 "./glsl.g" case 66: { ast(1) = makeAstNode<AssignmentExpression>(sym(2).kind, expression(1), expression(3)); } break; -#line 1015 "./glsl.g" +#line 1022 "./glsl.g" case 67: { sym(1).kind = AST::Kind_Assign; } break; -#line 1022 "./glsl.g" +#line 1029 "./glsl.g" case 68: { sym(1).kind = AST::Kind_AssignMultiply; } break; -#line 1029 "./glsl.g" +#line 1036 "./glsl.g" case 69: { sym(1).kind = AST::Kind_AssignDivide; } break; -#line 1036 "./glsl.g" +#line 1043 "./glsl.g" case 70: { sym(1).kind = AST::Kind_AssignModulus; } break; -#line 1043 "./glsl.g" +#line 1050 "./glsl.g" case 71: { sym(1).kind = AST::Kind_AssignPlus; } break; -#line 1050 "./glsl.g" +#line 1057 "./glsl.g" case 72: { sym(1).kind = AST::Kind_AssignMinus; } break; -#line 1057 "./glsl.g" +#line 1064 "./glsl.g" case 73: { sym(1).kind = AST::Kind_AssignShiftLeft; } break; -#line 1064 "./glsl.g" +#line 1071 "./glsl.g" case 74: { sym(1).kind = AST::Kind_AssignShiftRight; } break; -#line 1071 "./glsl.g" +#line 1078 "./glsl.g" case 75: { sym(1).kind = AST::Kind_AssignAnd; } break; -#line 1078 "./glsl.g" +#line 1085 "./glsl.g" case 76: { sym(1).kind = AST::Kind_AssignXor; } break; -#line 1085 "./glsl.g" +#line 1092 "./glsl.g" case 77: { sym(1).kind = AST::Kind_AssignOr; } break; -#line 1092 "./glsl.g" +#line 1099 "./glsl.g" case 78: { // nothing to do. } break; -#line 1099 "./glsl.g" +#line 1106 "./glsl.g" case 79: { ast(1) = makeAstNode<BinaryExpression>(AST::Kind_Comma, expression(1), expression(3)); } break; -#line 1106 "./glsl.g" +#line 1113 "./glsl.g" case 80: { // nothing to do. } break; -#line 1113 "./glsl.g" +#line 1120 "./glsl.g" case 81: { // ast(1) = new ...AST(...); } break; -#line 1120 "./glsl.g" +#line 1127 "./glsl.g" case 82: { // ast(1) = new ...AST(...); } break; -#line 1127 "./glsl.g" +#line 1134 "./glsl.g" case 83: { ast(1) = makeAstNode<PrecisionDeclaration>(sym(2).precision, type(3)); } break; -#line 1134 "./glsl.g" +#line 1141 "./glsl.g" case 84: { // ast(1) = new ...AST(...); } break; -#line 1141 "./glsl.g" +#line 1148 "./glsl.g" case 85: { // ast(1) = new ...AST(...); } break; -#line 1148 "./glsl.g" +#line 1155 "./glsl.g" case 86: { // ast(1) = new ...AST(...); } break; -#line 1155 "./glsl.g" +#line 1162 "./glsl.g" case 87: { // ast(1) = new ...AST(...); } break; -#line 1162 "./glsl.g" +#line 1169 "./glsl.g" case 88: { // ast(1) = new ...AST(...); } break; -#line 1169 "./glsl.g" +#line 1176 "./glsl.g" case 89: { // ast(1) = new ...AST(...); } break; -#line 1176 "./glsl.g" +#line 1183 "./glsl.g" case 90: { // ast(1) = new ...AST(...); } break; -#line 1183 "./glsl.g" +#line 1190 "./glsl.g" case 91: { // ast(1) = new ...AST(...); } break; -#line 1190 "./glsl.g" +#line 1197 "./glsl.g" case 92: { // ast(1) = new ...AST(...); } break; -#line 1197 "./glsl.g" +#line 1204 "./glsl.g" case 93: { // ast(1) = new ...AST(...); } break; -#line 1204 "./glsl.g" +#line 1211 "./glsl.g" case 94: { // ast(1) = new ...AST(...); } break; -#line 1211 "./glsl.g" +#line 1218 "./glsl.g" case 95: { // ast(1) = new ...AST(...); } break; -#line 1218 "./glsl.g" +#line 1225 "./glsl.g" case 96: { // ast(1) = new ...AST(...); } break; -#line 1225 "./glsl.g" +#line 1232 "./glsl.g" case 97: { // ast(1) = new ...AST(...); } break; -#line 1232 "./glsl.g" +#line 1239 "./glsl.g" case 98: { // ast(1) = new ...AST(...); } break; -#line 1239 "./glsl.g" +#line 1246 "./glsl.g" case 99: { // ast(1) = new ...AST(...); } break; -#line 1246 "./glsl.g" +#line 1253 "./glsl.g" case 100: { // ast(1) = new ...AST(...); } break; -#line 1253 "./glsl.g" +#line 1260 "./glsl.g" case 101: { // ast(1) = new ...AST(...); } break; -#line 1260 "./glsl.g" +#line 1267 "./glsl.g" case 102: { // ast(1) = new ...AST(...); } break; -#line 1267 "./glsl.g" +#line 1274 "./glsl.g" case 103: { // ast(1) = new ...AST(...); } break; -#line 1274 "./glsl.g" +#line 1281 "./glsl.g" case 104: { // ast(1) = new ...AST(...); } break; -#line 1281 "./glsl.g" +#line 1288 "./glsl.g" case 105: { // ast(1) = new ...AST(...); } break; -#line 1288 "./glsl.g" +#line 1295 "./glsl.g" case 106: { // ast(1) = new ...AST(...); } break; -#line 1295 "./glsl.g" +#line 1302 "./glsl.g" case 107: { // ast(1) = new ...AST(...); } break; -#line 1302 "./glsl.g" +#line 1309 "./glsl.g" case 108: { // ast(1) = new ...AST(...); } break; -#line 1309 "./glsl.g" +#line 1316 "./glsl.g" case 109: { // ast(1) = new ...AST(...); } break; -#line 1316 "./glsl.g" +#line 1323 "./glsl.g" case 110: { // ast(1) = new ...AST(...); } break; -#line 1323 "./glsl.g" +#line 1330 "./glsl.g" case 111: { // ast(1) = new ...AST(...); } break; -#line 1330 "./glsl.g" +#line 1337 "./glsl.g" case 112: { // ast(1) = new ...AST(...); } break; -#line 1337 "./glsl.g" +#line 1344 "./glsl.g" case 113: { // ast(1) = new ...AST(...); } break; -#line 1344 "./glsl.g" +#line 1351 "./glsl.g" case 114: { // ast(1) = new ...AST(...); } break; -#line 1351 "./glsl.g" +#line 1358 "./glsl.g" case 115: { // ast(1) = new ...AST(...); } break; -#line 1358 "./glsl.g" +#line 1365 "./glsl.g" case 116: { // ast(1) = new ...AST(...); } break; -#line 1365 "./glsl.g" +#line 1372 "./glsl.g" case 117: { // ast(1) = new ...AST(...); } break; -#line 1372 "./glsl.g" +#line 1379 "./glsl.g" case 118: { // ast(1) = new ...AST(...); } break; -#line 1379 "./glsl.g" +#line 1386 "./glsl.g" case 119: { // ast(1) = new ...AST(...); } break; -#line 1386 "./glsl.g" +#line 1393 "./glsl.g" case 120: { // ast(1) = new ...AST(...); } break; -#line 1393 "./glsl.g" +#line 1400 "./glsl.g" case 121: { - // ast(1) = new ...AST(...); + ast(1) = makeAstNode<QualifiedType>(0, type(1), (List<LayoutQualifier *> *)0); } break; -#line 1400 "./glsl.g" +#line 1407 "./glsl.g" case 122: { - // ast(1) = new ...AST(...); + ast(1) = makeAstNode<QualifiedType> + (sym(1).type_qualifier.qualifier, type(2), + sym(1).type_qualifier.layout_list); } break; -#line 1407 "./glsl.g" +#line 1416 "./glsl.g" case 123: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Invariant; } break; -#line 1414 "./glsl.g" +#line 1423 "./glsl.g" case 124: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Smooth; } break; -#line 1421 "./glsl.g" +#line 1430 "./glsl.g" case 125: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Flat; } break; -#line 1428 "./glsl.g" +#line 1437 "./glsl.g" case 126: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::NoPerspective; } break; -#line 1435 "./glsl.g" +#line 1444 "./glsl.g" case 127: { - // ast(1) = new ...AST(...); + sym(1) = sym(3); } break; -#line 1442 "./glsl.g" +#line 1451 "./glsl.g" case 128: { - // ast(1) = new ...AST(...); + sym(1).layout_list = makeAstNode< List<LayoutQualifier *> >(sym(1).layout); } break; -#line 1449 "./glsl.g" +#line 1458 "./glsl.g" case 129: { - // ast(1) = new ...AST(...); + sym(1).layout_list = makeAstNode< List<LayoutQualifier *> >(sym(1).layout_list, sym(3).layout); } break; -#line 1456 "./glsl.g" +#line 1465 "./glsl.g" case 130: { - // ast(1) = new ...AST(...); + sym(1).layout = makeAstNode<LayoutQualifier>(string(1), (const std::string *)0); } break; -#line 1463 "./glsl.g" +#line 1472 "./glsl.g" case 131: { - // ast(1) = new ...AST(...); + sym(1).layout = makeAstNode<LayoutQualifier>(string(1), string(3)); } break; -#line 1470 "./glsl.g" +#line 1479 "./glsl.g" case 132: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Const; } break; -#line 1477 "./glsl.g" +#line 1486 "./glsl.g" case 133: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; -#line 1484 "./glsl.g" +#line 1494 "./glsl.g" case 134: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = 0; } break; -#line 1491 "./glsl.g" +#line 1502 "./glsl.g" case 135: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.layout_list = sym(1).layout_list; + sym(1).type_qualifier.qualifier = sym(2).qualifier; } break; -#line 1498 "./glsl.g" +#line 1510 "./glsl.g" case 136: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; -#line 1505 "./glsl.g" +#line 1518 "./glsl.g" case 137: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; -#line 1512 "./glsl.g" +#line 1526 "./glsl.g" case 138: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; -#line 1519 "./glsl.g" +#line 1534 "./glsl.g" case 139: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; + sym(1).type_qualifier.layout_list = 0; } break; -#line 1526 "./glsl.g" +#line 1542 "./glsl.g" case 140: { - // ast(1) = new ...AST(...); + sym(1).type_qualifier.qualifier = QualifiedType::Invariant; + sym(1).type_qualifier.layout_list = 0; } break; -#line 1533 "./glsl.g" +#line 1550 "./glsl.g" case 141: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Const; } break; -#line 1540 "./glsl.g" +#line 1557 "./glsl.g" case 142: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Attribute; } break; -#line 1547 "./glsl.g" +#line 1564 "./glsl.g" case 143: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Varying; } break; -#line 1554 "./glsl.g" +#line 1571 "./glsl.g" case 144: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::CentroidVarying; } break; -#line 1561 "./glsl.g" +#line 1578 "./glsl.g" case 145: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::In; } break; -#line 1568 "./glsl.g" +#line 1585 "./glsl.g" case 146: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Out; } break; -#line 1575 "./glsl.g" +#line 1592 "./glsl.g" case 147: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::CentroidIn; } break; -#line 1582 "./glsl.g" +#line 1599 "./glsl.g" case 148: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::CentroidOut; } break; -#line 1589 "./glsl.g" +#line 1606 "./glsl.g" case 149: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::PatchIn; } break; -#line 1596 "./glsl.g" +#line 1613 "./glsl.g" case 150: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::PatchOut; } break; -#line 1603 "./glsl.g" +#line 1620 "./glsl.g" case 151: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::SampleIn; } break; -#line 1610 "./glsl.g" +#line 1627 "./glsl.g" case 152: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::SampleOut; } break; -#line 1617 "./glsl.g" +#line 1634 "./glsl.g" case 153: { - // ast(1) = new ...AST(...); + sym(1).qualifier = QualifiedType::Uniform; } break; -#line 1624 "./glsl.g" +#line 1641 "./glsl.g" case 154: { // nothing to do. } break; -#line 1631 "./glsl.g" +#line 1648 "./glsl.g" case 155: { if (!type(2)->setPrecision(sym(1).precision)) { @@ -1112,957 +1122,976 @@ case 155: { ast(1) = type(2); } break; -#line 1641 "./glsl.g" +#line 1658 "./glsl.g" case 156: { // nothing to do. } break; -#line 1648 "./glsl.g" +#line 1665 "./glsl.g" case 157: { ast(1) = makeAstNode<ArrayType>(type(1)); } break; -#line 1655 "./glsl.g" +#line 1672 "./glsl.g" case 158: { ast(1) = makeAstNode<ArrayType>(type(1), expression(3)); } break; -#line 1662 "./glsl.g" +#line 1679 "./glsl.g" case 159: { ast(1) = makeBasicType(T_VOID, Type::Void); } break; -#line 1669 "./glsl.g" +#line 1686 "./glsl.g" case 160: { ast(1) = makeBasicType(T_FLOAT, Type::Primitive); } break; -#line 1676 "./glsl.g" +#line 1693 "./glsl.g" case 161: { ast(1) = makeBasicType(T_DOUBLE, Type::Primitive); } break; -#line 1683 "./glsl.g" +#line 1700 "./glsl.g" case 162: { ast(1) = makeBasicType(T_INT, Type::Primitive); } break; -#line 1690 "./glsl.g" +#line 1707 "./glsl.g" case 163: { ast(1) = makeBasicType(T_UINT, Type::Primitive); } break; -#line 1697 "./glsl.g" +#line 1714 "./glsl.g" case 164: { ast(1) = makeBasicType(T_BOOL, Type::Primitive); } break; -#line 1704 "./glsl.g" +#line 1721 "./glsl.g" case 165: { ast(1) = makeBasicType(T_VEC2, Type::Vector2); } break; -#line 1711 "./glsl.g" +#line 1728 "./glsl.g" case 166: { ast(1) = makeBasicType(T_VEC3, Type::Vector3); } break; -#line 1718 "./glsl.g" +#line 1735 "./glsl.g" case 167: { ast(1) = makeBasicType(T_VEC4, Type::Vector4); } break; -#line 1725 "./glsl.g" +#line 1742 "./glsl.g" case 168: { ast(1) = makeBasicType(T_DVEC2, Type::Vector2); } break; -#line 1732 "./glsl.g" +#line 1749 "./glsl.g" case 169: { ast(1) = makeBasicType(T_DVEC3, Type::Vector3); } break; -#line 1739 "./glsl.g" +#line 1756 "./glsl.g" case 170: { ast(1) = makeBasicType(T_DVEC4, Type::Vector4); } break; -#line 1746 "./glsl.g" +#line 1763 "./glsl.g" case 171: { ast(1) = makeBasicType(T_BVEC2, Type::Vector2); } break; -#line 1753 "./glsl.g" +#line 1770 "./glsl.g" case 172: { ast(1) = makeBasicType(T_BVEC3, Type::Vector3); } break; -#line 1760 "./glsl.g" +#line 1777 "./glsl.g" case 173: { ast(1) = makeBasicType(T_BVEC4, Type::Vector4); } break; -#line 1767 "./glsl.g" +#line 1784 "./glsl.g" case 174: { ast(1) = makeBasicType(T_IVEC2, Type::Vector2); } break; -#line 1774 "./glsl.g" +#line 1791 "./glsl.g" case 175: { ast(1) = makeBasicType(T_IVEC3, Type::Vector3); } break; -#line 1781 "./glsl.g" +#line 1798 "./glsl.g" case 176: { ast(1) = makeBasicType(T_IVEC4, Type::Vector4); } break; -#line 1788 "./glsl.g" +#line 1805 "./glsl.g" case 177: { ast(1) = makeBasicType(T_UVEC2, Type::Vector2); } break; -#line 1795 "./glsl.g" +#line 1812 "./glsl.g" case 178: { ast(1) = makeBasicType(T_UVEC3, Type::Vector3); } break; -#line 1802 "./glsl.g" +#line 1819 "./glsl.g" case 179: { ast(1) = makeBasicType(T_UVEC4, Type::Vector4); } break; -#line 1809 "./glsl.g" +#line 1826 "./glsl.g" case 180: { ast(1) = makeBasicType(T_MAT2, Type::Matrix); } break; -#line 1816 "./glsl.g" +#line 1833 "./glsl.g" case 181: { ast(1) = makeBasicType(T_MAT3, Type::Matrix); } break; -#line 1823 "./glsl.g" +#line 1840 "./glsl.g" case 182: { ast(1) = makeBasicType(T_MAT4, Type::Matrix); } break; -#line 1830 "./glsl.g" +#line 1847 "./glsl.g" case 183: { ast(1) = makeBasicType(T_MAT2X2, Type::Matrix); } break; -#line 1837 "./glsl.g" +#line 1854 "./glsl.g" case 184: { ast(1) = makeBasicType(T_MAT2X3, Type::Matrix); } break; -#line 1844 "./glsl.g" +#line 1861 "./glsl.g" case 185: { ast(1) = makeBasicType(T_MAT2X4, Type::Matrix); } break; -#line 1851 "./glsl.g" +#line 1868 "./glsl.g" case 186: { ast(1) = makeBasicType(T_MAT3X2, Type::Matrix); } break; -#line 1858 "./glsl.g" +#line 1875 "./glsl.g" case 187: { ast(1) = makeBasicType(T_MAT3X3, Type::Matrix); } break; -#line 1865 "./glsl.g" +#line 1882 "./glsl.g" case 188: { ast(1) = makeBasicType(T_MAT3X4, Type::Matrix); } break; -#line 1872 "./glsl.g" +#line 1889 "./glsl.g" case 189: { ast(1) = makeBasicType(T_MAT4X2, Type::Matrix); } break; -#line 1879 "./glsl.g" +#line 1896 "./glsl.g" case 190: { ast(1) = makeBasicType(T_MAT4X3, Type::Matrix); } break; -#line 1886 "./glsl.g" +#line 1903 "./glsl.g" case 191: { ast(1) = makeBasicType(T_MAT4X4, Type::Matrix); } break; -#line 1893 "./glsl.g" +#line 1910 "./glsl.g" case 192: { ast(1) = makeBasicType(T_DMAT2, Type::Matrix); } break; -#line 1900 "./glsl.g" +#line 1917 "./glsl.g" case 193: { ast(1) = makeBasicType(T_DMAT3, Type::Matrix); } break; -#line 1907 "./glsl.g" +#line 1924 "./glsl.g" case 194: { ast(1) = makeBasicType(T_DMAT4, Type::Matrix); } break; -#line 1914 "./glsl.g" +#line 1931 "./glsl.g" case 195: { ast(1) = makeBasicType(T_DMAT2X2, Type::Matrix); } break; -#line 1921 "./glsl.g" +#line 1938 "./glsl.g" case 196: { ast(1) = makeBasicType(T_DMAT2X3, Type::Matrix); } break; -#line 1928 "./glsl.g" +#line 1945 "./glsl.g" case 197: { ast(1) = makeBasicType(T_DMAT2X4, Type::Matrix); } break; -#line 1935 "./glsl.g" +#line 1952 "./glsl.g" case 198: { ast(1) = makeBasicType(T_DMAT3X2, Type::Matrix); } break; -#line 1942 "./glsl.g" +#line 1959 "./glsl.g" case 199: { ast(1) = makeBasicType(T_DMAT3X3, Type::Matrix); } break; -#line 1949 "./glsl.g" +#line 1966 "./glsl.g" case 200: { ast(1) = makeBasicType(T_DMAT3X4, Type::Matrix); } break; -#line 1956 "./glsl.g" +#line 1973 "./glsl.g" case 201: { ast(1) = makeBasicType(T_DMAT4X2, Type::Matrix); } break; -#line 1963 "./glsl.g" +#line 1980 "./glsl.g" case 202: { ast(1) = makeBasicType(T_DMAT4X3, Type::Matrix); } break; -#line 1970 "./glsl.g" +#line 1987 "./glsl.g" case 203: { ast(1) = makeBasicType(T_DMAT4X4, Type::Matrix); } break; -#line 1977 "./glsl.g" +#line 1994 "./glsl.g" case 204: { ast(1) = makeBasicType(T_SAMPLER1D, Type::Sampler1D); } break; -#line 1984 "./glsl.g" +#line 2001 "./glsl.g" case 205: { ast(1) = makeBasicType(T_SAMPLER2D, Type::Sampler2D); } break; -#line 1991 "./glsl.g" +#line 2008 "./glsl.g" case 206: { ast(1) = makeBasicType(T_SAMPLER3D, Type::Sampler3D); } break; -#line 1998 "./glsl.g" +#line 2015 "./glsl.g" case 207: { ast(1) = makeBasicType(T_SAMPLERCUBE, Type::SamplerCube); } break; -#line 2005 "./glsl.g" +#line 2022 "./glsl.g" case 208: { ast(1) = makeBasicType(T_SAMPLER1DSHADOW, Type::Sampler1DShadow); } break; -#line 2012 "./glsl.g" +#line 2029 "./glsl.g" case 209: { ast(1) = makeBasicType(T_SAMPLER2DSHADOW, Type::Sampler2DShadow); } break; -#line 2019 "./glsl.g" +#line 2036 "./glsl.g" case 210: { ast(1) = makeBasicType(T_SAMPLERCUBESHADOW, Type::SamplerCubeShadow); } break; -#line 2026 "./glsl.g" +#line 2043 "./glsl.g" case 211: { ast(1) = makeBasicType(T_SAMPLER1DARRAY, Type::Sampler1DArray); } break; -#line 2033 "./glsl.g" +#line 2050 "./glsl.g" case 212: { ast(1) = makeBasicType(T_SAMPLER2DARRAY, Type::Sampler2DArray); } break; -#line 2040 "./glsl.g" +#line 2057 "./glsl.g" case 213: { ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW, Type::Sampler1DArrayShadow); } break; -#line 2047 "./glsl.g" +#line 2064 "./glsl.g" case 214: { ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW, Type::Sampler2DArrayShadow); } break; -#line 2054 "./glsl.g" +#line 2071 "./glsl.g" case 215: { ast(1) = makeBasicType(T_SAMPLERCUBEARRAY, Type::SamplerCubeShadow); } break; -#line 2061 "./glsl.g" +#line 2078 "./glsl.g" case 216: { ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW, Type::SamplerCubeArrayShadow); } break; -#line 2068 "./glsl.g" +#line 2085 "./glsl.g" case 217: { ast(1) = makeBasicType(T_ISAMPLER1D, Type::Sampler1D); } break; -#line 2075 "./glsl.g" +#line 2092 "./glsl.g" case 218: { ast(1) = makeBasicType(T_ISAMPLER2D, Type::Sampler2D); } break; -#line 2082 "./glsl.g" +#line 2099 "./glsl.g" case 219: { ast(1) = makeBasicType(T_ISAMPLER3D, Type::Sampler3D); } break; -#line 2089 "./glsl.g" +#line 2106 "./glsl.g" case 220: { ast(1) = makeBasicType(T_ISAMPLERCUBE, Type::SamplerCube); } break; -#line 2096 "./glsl.g" +#line 2113 "./glsl.g" case 221: { ast(1) = makeBasicType(T_ISAMPLER1DARRAY, Type::Sampler1DArray); } break; -#line 2103 "./glsl.g" +#line 2120 "./glsl.g" case 222: { ast(1) = makeBasicType(T_ISAMPLER2DARRAY, Type::Sampler2DArray); } break; -#line 2110 "./glsl.g" +#line 2127 "./glsl.g" case 223: { ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY, Type::SamplerCubeArray); } break; -#line 2117 "./glsl.g" +#line 2134 "./glsl.g" case 224: { ast(1) = makeBasicType(T_USAMPLER1D, Type::Sampler1D); } break; -#line 2124 "./glsl.g" +#line 2141 "./glsl.g" case 225: { ast(1) = makeBasicType(T_USAMPLER2D, Type::Sampler2D); } break; -#line 2131 "./glsl.g" +#line 2148 "./glsl.g" case 226: { ast(1) = makeBasicType(T_USAMPLER3D, Type::Sampler3D); } break; -#line 2138 "./glsl.g" +#line 2155 "./glsl.g" case 227: { ast(1) = makeBasicType(T_USAMPLERCUBE, Type::SamplerCube); } break; -#line 2145 "./glsl.g" +#line 2162 "./glsl.g" case 228: { ast(1) = makeBasicType(T_USAMPLER1DARRAY, Type::Sampler1DArray); } break; -#line 2152 "./glsl.g" +#line 2169 "./glsl.g" case 229: { ast(1) = makeBasicType(T_USAMPLER2DARRAY, Type::Sampler2DArray); } break; -#line 2159 "./glsl.g" +#line 2176 "./glsl.g" case 230: { ast(1) = makeBasicType(T_USAMPLERCUBEARRAY, Type::SamplerCubeArray); } break; -#line 2166 "./glsl.g" +#line 2183 "./glsl.g" case 231: { ast(1) = makeBasicType(T_SAMPLER2DRECT, Type::Sampler2DRect); } break; -#line 2173 "./glsl.g" +#line 2190 "./glsl.g" case 232: { ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW, Type::Sampler2DRectShadow); } break; -#line 2180 "./glsl.g" +#line 2197 "./glsl.g" case 233: { ast(1) = makeBasicType(T_ISAMPLER2DRECT, Type::Sampler2DRect); } break; -#line 2187 "./glsl.g" +#line 2204 "./glsl.g" case 234: { ast(1) = makeBasicType(T_USAMPLER2DRECT, Type::Sampler2DRect); } break; -#line 2194 "./glsl.g" +#line 2211 "./glsl.g" case 235: { ast(1) = makeBasicType(T_SAMPLERBUFFER, Type::SamplerBuffer); } break; -#line 2201 "./glsl.g" +#line 2218 "./glsl.g" case 236: { ast(1) = makeBasicType(T_ISAMPLERBUFFER, Type::SamplerBuffer); } break; -#line 2208 "./glsl.g" +#line 2225 "./glsl.g" case 237: { ast(1) = makeBasicType(T_USAMPLERBUFFER, Type::SamplerBuffer); } break; -#line 2215 "./glsl.g" +#line 2232 "./glsl.g" case 238: { ast(1) = makeBasicType(T_SAMPLER2DMS, Type::Sampler2DMS); } break; -#line 2222 "./glsl.g" +#line 2239 "./glsl.g" case 239: { ast(1) = makeBasicType(T_ISAMPLER2DMS, Type::Sampler2DMS); } break; -#line 2229 "./glsl.g" +#line 2246 "./glsl.g" case 240: { ast(1) = makeBasicType(T_USAMPLER2DMS, Type::Sampler2DMS); } break; -#line 2236 "./glsl.g" +#line 2253 "./glsl.g" case 241: { ast(1) = makeBasicType(T_SAMPLER2DMSARRAY, Type::Sampler2DMSArray); } break; -#line 2243 "./glsl.g" +#line 2260 "./glsl.g" case 242: { ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY, Type::Sampler2DMSArray); } break; -#line 2250 "./glsl.g" +#line 2267 "./glsl.g" case 243: { ast(1) = makeBasicType(T_USAMPLER2DMSARRAY, Type::Sampler2DMSArray); } break; -#line 2257 "./glsl.g" +#line 2274 "./glsl.g" case 244: { // nothing to do. } break; -#line 2264 "./glsl.g" +#line 2281 "./glsl.g" case 245: { ast(1) = makeAstNode<NamedType>(string(1)); } break; -#line 2271 "./glsl.g" +#line 2288 "./glsl.g" case 246: { sym(1).precision = Type::Highp; } break; -#line 2278 "./glsl.g" +#line 2295 "./glsl.g" case 247: { sym(1).precision = Type::Mediump; } break; -#line 2285 "./glsl.g" +#line 2302 "./glsl.g" case 248: { sym(1).precision = Type::Lowp; } break; -#line 2292 "./glsl.g" +#line 2309 "./glsl.g" case 249: { ast(1) = makeAstNode<StructType>(string(2), sym(4).field_list); } break; -#line 2299 "./glsl.g" +#line 2316 "./glsl.g" case 250: { ast(1) = makeAstNode<StructType>(sym(3).field_list); } break; -#line 2306 "./glsl.g" +#line 2323 "./glsl.g" case 251: { // nothing to do. } break; -#line 2313 "./glsl.g" +#line 2330 "./glsl.g" case 252: { sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); } break; -#line 2320 "./glsl.g" +#line 2337 "./glsl.g" case 253: { sym(1).field_list = StructType::fixInnerTypes(type(1), sym(2).field_list); } break; -#line 2327 "./glsl.g" +#line 2344 "./glsl.g" case 254: { - // TODO: type qualifier - sym(1).field_list = StructType::fixInnerTypes(type(2), sym(3).field_list); + sym(1).field_list = StructType::fixInnerTypes + (makeAstNode<QualifiedType> + (sym(1).type_qualifier.qualifier, type(2), + sym(1).type_qualifier.layout_list), sym(3).field_list); } break; -#line 2335 "./glsl.g" +#line 2354 "./glsl.g" case 255: { // nothing to do. sym(1).field_list = makeAstNode< List<StructType::Field *> >(sym(1).field); } break; -#line 2343 "./glsl.g" +#line 2362 "./glsl.g" case 256: { sym(1).field_list = makeAstNode< List<StructType::Field *> >(sym(1).field_list, sym(3).field); } break; -#line 2350 "./glsl.g" +#line 2369 "./glsl.g" case 257: { sym(1).field = makeAstNode<StructType::Field>(string(1)); } break; -#line 2357 "./glsl.g" +#line 2376 "./glsl.g" case 258: { sym(1).field = makeAstNode<StructType::Field> (string(1), makeAstNode<ArrayType>((Type *)0)); } break; -#line 2365 "./glsl.g" +#line 2384 "./glsl.g" case 259: { sym(1).field = makeAstNode<StructType::Field> (string(1), makeAstNode<ArrayType>((Type *)0, expression(3))); } break; -#line 2373 "./glsl.g" +#line 2392 "./glsl.g" case 260: { // ast(1) = new ...AST(...); } break; -#line 2380 "./glsl.g" +#line 2399 "./glsl.g" case 261: { // ast(1) = new ...AST(...); } break; -#line 2387 "./glsl.g" +#line 2406 "./glsl.g" case 262: { // nothing to do. } break; -#line 2394 "./glsl.g" +#line 2413 "./glsl.g" case 263: { // nothing to do. } break; -#line 2401 "./glsl.g" +#line 2420 "./glsl.g" case 264: { // nothing to do. } break; -#line 2408 "./glsl.g" +#line 2427 "./glsl.g" case 265: { // nothing to do. } break; -#line 2415 "./glsl.g" +#line 2434 "./glsl.g" case 266: { // nothing to do. } break; -#line 2422 "./glsl.g" +#line 2441 "./glsl.g" case 267: { // nothing to do. } break; -#line 2429 "./glsl.g" +#line 2448 "./glsl.g" case 268: { // nothing to do. } break; -#line 2436 "./glsl.g" +#line 2455 "./glsl.g" case 269: { // nothing to do. } break; -#line 2443 "./glsl.g" +#line 2462 "./glsl.g" case 270: { // nothing to do. } break; -#line 2450 "./glsl.g" +#line 2469 "./glsl.g" case 271: { ast(1) = makeAstNode<CompoundStatement>(); } break; -#line 2457 "./glsl.g" +#line 2476 "./glsl.g" case 272: { ast(1) = makeAstNode<CompoundStatement>(sym(2).statement_list); } break; -#line 2464 "./glsl.g" +#line 2483 "./glsl.g" case 273: { // nothing to do. } break; -#line 2471 "./glsl.g" +#line 2490 "./glsl.g" case 274: { // nothing to do. } break; -#line 2478 "./glsl.g" +#line 2497 "./glsl.g" case 275: { ast(1) = makeAstNode<CompoundStatement>(); } break; -#line 2485 "./glsl.g" +#line 2504 "./glsl.g" case 276: { ast(1) = makeAstNode<CompoundStatement>(sym(2).statement_list); } break; -#line 2492 "./glsl.g" +#line 2511 "./glsl.g" case 277: { sym(1).statement_list = makeAstNode< List<Statement *> >(sym(1).statement); } break; -#line 2499 "./glsl.g" +#line 2518 "./glsl.g" case 278: { sym(1).statement_list = makeAstNode< List<Statement *> >(sym(1).statement_list, sym(2).statement); } break; -#line 2506 "./glsl.g" +#line 2525 "./glsl.g" case 279: { ast(1) = makeAstNode<CompoundStatement>(); // Empty statement } break; -#line 2513 "./glsl.g" +#line 2532 "./glsl.g" case 280: { ast(1) = makeAstNode<ExpressionStatement>(expression(1)); } break; -#line 2520 "./glsl.g" +#line 2539 "./glsl.g" case 281: { ast(1) = makeAstNode<IfStatement>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); } break; -#line 2527 "./glsl.g" +#line 2546 "./glsl.g" case 282: { sym(1).ifstmt.thenClause = statement(1); sym(1).ifstmt.elseClause = statement(3); } break; -#line 2535 "./glsl.g" +#line 2554 "./glsl.g" case 283: { sym(1).ifstmt.thenClause = statement(1); sym(1).ifstmt.elseClause = 0; } break; -#line 2543 "./glsl.g" +#line 2562 "./glsl.g" case 284: { // nothing to do. } break; -#line 2550 "./glsl.g" +#line 2569 "./glsl.g" case 285: { // ast(1) = new ...AST(...); } break; -#line 2557 "./glsl.g" +#line 2576 "./glsl.g" case 286: { ast(1) = makeAstNode<SwitchStatement>(expression(3), statement(6)); } break; -#line 2564 "./glsl.g" +#line 2583 "./glsl.g" case 287: { ast(1) = makeAstNode<CompoundStatement>(); } break; -#line 2571 "./glsl.g" +#line 2590 "./glsl.g" case 288: { ast(1) = makeAstNode<CompoundStatement>(sym(1).statement_list); } break; -#line 2578 "./glsl.g" +#line 2597 "./glsl.g" case 289: { ast(1) = makeAstNode<CaseLabelStatement>(expression(2)); } break; -#line 2585 "./glsl.g" +#line 2604 "./glsl.g" case 290: { ast(1) = makeAstNode<CaseLabelStatement>(); } break; -#line 2592 "./glsl.g" +#line 2611 "./glsl.g" case 291: { ast(1) = makeAstNode<WhileStatement>(expression(3), statement(5)); } break; -#line 2599 "./glsl.g" +#line 2618 "./glsl.g" case 292: { ast(1) = makeAstNode<DoStatement>(statement(2), expression(5)); } break; -#line 2606 "./glsl.g" +#line 2625 "./glsl.g" case 293: { ast(1) = makeAstNode<ForStatement>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); } break; -#line 2613 "./glsl.g" +#line 2632 "./glsl.g" case 294: { // nothing to do. } break; -#line 2620 "./glsl.g" +#line 2639 "./glsl.g" case 295: { // nothing to do. } break; -#line 2627 "./glsl.g" +#line 2646 "./glsl.g" case 296: { // nothing to do. } break; -#line 2634 "./glsl.g" +#line 2653 "./glsl.g" case 297: { // nothing to do. } break; -#line 2641 "./glsl.g" +#line 2660 "./glsl.g" case 298: { sym(1).forstmt.condition = expression(1); sym(1).forstmt.increment = 0; } break; -#line 2649 "./glsl.g" +#line 2668 "./glsl.g" case 299: { sym(1).forstmt.condition = expression(1); sym(1).forstmt.increment = expression(3); } break; -#line 2657 "./glsl.g" +#line 2676 "./glsl.g" case 300: { ast(1) = makeAstNode<JumpStatement>(AST::Kind_Continue); } break; -#line 2664 "./glsl.g" +#line 2683 "./glsl.g" case 301: { ast(1) = makeAstNode<JumpStatement>(AST::Kind_Break); } break; -#line 2671 "./glsl.g" +#line 2690 "./glsl.g" case 302: { ast(1) = makeAstNode<ReturnStatement>(); } break; -#line 2678 "./glsl.g" +#line 2697 "./glsl.g" case 303: { ast(1) = makeAstNode<ReturnStatement>(expression(2)); } break; -#line 2685 "./glsl.g" +#line 2704 "./glsl.g" case 304: { ast(1) = makeAstNode<JumpStatement>(AST::Kind_Discard); } break; -#line 2692 "./glsl.g" +#line 2711 "./glsl.g" case 305: { ast(1) = makeAstNode<TranslationUnit>(sym(1).declaration_list); } break; -#line 2699 "./glsl.g" +#line 2718 "./glsl.g" case 306: { - sym(1).declaration_list = makeAstNode< List<Declaration *> >(sym(1).declaration); + if (sym(1).declaration) { + sym(1).declaration_list = makeAstNode< List<Declaration *> > + (sym(1).declaration); + } else { + sym(1).declaration_list = 0; + } } break; -#line 2706 "./glsl.g" +#line 2730 "./glsl.g" case 307: { - sym(1).declaration_list = makeAstNode< List<Declaration *> >(sym(1).declaration_list, sym(2).declaration); + if (sym(1).declaration_list && sym(2).declaration) { + sym(1).declaration_list = makeAstNode< List<Declaration *> > + (sym(1).declaration_list, sym(2).declaration); + } else if (!sym(1).declaration_list) { + if (sym(2).declaration) { + sym(1).declaration_list = makeAstNode< List<Declaration *> > + (sym(2).declaration); + } else { + sym(1).declaration_list = 0; + } + } else { + sym(1).declaration_list = 0; + } } break; -#line 2713 "./glsl.g" +#line 2749 "./glsl.g" case 308: { // ast(1) = new ...AST(...); } break; -#line 2720 "./glsl.g" +#line 2756 "./glsl.g" case 309: { // ast(1) = new ...AST(...); } break; -#line 2727 "./glsl.g" +#line 2763 "./glsl.g" case 310: { - // ast(1) = new ...AST(...); + ast(1) = 0; } break; -#line 2734 "./glsl.g" +#line 2770 "./glsl.g" case 311: { // ast(1) = new ...AST(...); } break; -#line 2741 "./glsl.g" +#line 2777 "./glsl.g" case 312: { ast(1) = 0; } break; -#line 2749 "./glsl.g" +#line 2785 "./glsl.g" } // end switch } // end Parser::reduce() diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h index 544d9f6fd3..05a977152b 100644 --- a/src/libs/glsl/glslparser.h +++ b/src/libs/glsl/glslparser.h @@ -72,6 +72,13 @@ public: FunctionIdentifier *id; List<Expression *> *arguments; } function; + int qualifier; + LayoutQualifier *layout; + List<LayoutQualifier *> *layout_list; + struct { + int qualifier; + List<LayoutQualifier *> *layout_list; + } type_qualifier; // ### ast nodes... }; |