Implement the ternary operator in GLSL

[libs/gl.git] / source / glsl / validate.h

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index b64973276536e2dbc653ac30f142866ccb3b3fcb..bafa550bd480d2f32ccbac2652e57bbafaac2a80 100644 (file)
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -14,11 +14,14 @@ class Validator: protected TraversingVisitor
 {
 protected:
        Stage *stage;
+       Node *last_provoker;
 
        Validator();
 
-       void diagnose(Node &, Diagnostic::Severity, const std::string &);
+       void diagnose(Node &, Node &, Diagnostic::Severity, const std::string &);
+       void diagnose(Node &n, Diagnostic::Severity s, const std::string &m) { diagnose(n, n, s, m); }
        void error(Node &n, const std::string &m) { diagnose(n, Diagnostic::ERR, m); }
+       void add_info(Node &, const std::string &);
 };
 
 class TypeValidator: private Validator
@@ -45,6 +48,7 @@ private:
 
        std::map<Block *, BlockDeclarationMap> declarations;
        std::map<std::string, InterfaceBlock *> interface_blocks;
+       std::map<std::string, FunctionDeclaration *> overloaded_functions;
        bool anonymous_block;
 
 public:
@@ -78,6 +82,7 @@ private:
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(InterfaceBlockReference &);
+       virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
@@ -93,6 +98,7 @@ private:
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(VariableDeclaration &);
 };