X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=e21dd98fd0fcbe63e578e3012cd072d108c5437d;hb=55a18f710f07c51f05d0dc55741a7f3cc8e70cdd;hp=1504acb224e27dd5290947e9700fa657750ba433;hpb=0ded10909240623e33712be80855827d440f3caf;p=libs%2Fgl.git diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h index 1504acb2..e21dd98f 100644 --- a/source/glsl/optimize.h +++ b/source/glsl/optimize.h @@ -27,7 +27,7 @@ private: /** Finds functions which are candidates for inlining. Currently this means functions which have no flow control statements, no more than one return -statement, and are only called once. */ +statement, and are either builtins or only called once. */ class InlineableFunctionLocator: private TraversingVisitor { private: @@ -227,6 +227,26 @@ private: virtual void visit(Iteration &); }; +class UnreachableCodeRemover: private TraversingVisitor +{ +private: + bool reachable; + std::set 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 +300,8 @@ private: Assignment *r_assignment; bool assignment_target; bool r_side_effects; + bool composite_reference; + Assignment::Target r_reference; std::set unused_nodes; public: @@ -291,9 +313,13 @@ private: void referenced(const Assignment::Target &, Node &); virtual void visit(VariableReference &); virtual void visit(InterfaceBlockReference &); + void visit_composite(Expression &); + virtual void visit(MemberAccess &); + virtual void visit(Swizzle &); virtual void visit(UnaryExpression &); virtual void visit(BinaryExpression &); virtual void visit(Assignment &); + virtual void visit(TernaryExpression &); virtual void visit(FunctionCall &); void record_assignment(const Assignment::Target &, Node &); virtual void visit(ExpressionStatement &);