Fold type conversions of constants

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index b7b39176a06e62490573cee96ec174fbcd276ad4..7d064056e48ceb6d72bb7d9a4b2e9d5099f2e401 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -175,13 +175,16 @@ public:
        bool apply(Stage &s) { s.content.visit(*this); return r_any_folded; }
 
 private:
-       static BasicTypeDeclaration::Kind get_value_kind(const Variant &);
        template<typename T>
        static T evaluate_logical(char, T, T);
        template<typename T>
        static bool evaluate_relation(const char *, T, T);
        template<typename T>
        static T evaluate_arithmetic(char, T, T);
+       template<typename T>
+       static T evaluate_int_special_op(char, T, T);
+       template<typename T>
+       void convert_to_result(const Variant &);
        void set_result(const Variant &, bool = false);
 
        virtual void visit(RefPtr<Expression> &);
@@ -227,6 +230,26 @@ private:
        virtual void visit(Iteration &);
 };
 
+class UnreachableCodeRemover: private TraversingVisitor
+{
+private:
+       bool reachable;
+       std::set<Node *> unreachable_nodes;
+
+public:
+       UnreachableCodeRemover();
+
+       virtual bool apply(Stage &);
+
+private:
+       virtual void visit(Block &);
+       virtual void visit(FunctionDeclaration &);
+       virtual void visit(Conditional &);
+       virtual void visit(Iteration &);
+       virtual void visit(Return &) { reachable = false; }
+       virtual void visit(Jump &) { reachable = false; }
+};
+
 /** Removes types which are not used anywhere. */
 class UnusedTypeRemover: private TraversingVisitor
 {
@@ -280,6 +303,7 @@ private:
        Assignment *r_assignment;
        bool assignment_target;
        bool r_side_effects;
+       bool in_struct;
        bool composite_reference;
        Assignment::Target r_reference;
        std::set<Node *> unused_nodes;
@@ -303,8 +327,7 @@ private:
        virtual void visit(FunctionCall &);
        void record_assignment(const Assignment::Target &, Node &);
        virtual void visit(ExpressionStatement &);
-       // Ignore structs because their members can't be accessed directly.
-       virtual void visit(StructDeclaration &) { }
+       virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
        void merge_variables(const BlockVariableMap &);