X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=cc2e3a0c8bc2c6570e30bb50decd35cd413b97f1;hb=6f06479b765946bdd3174b2c05e7a1dda24c31c2;hp=82ad244c1d7083c1ad8b61e4c22fee69e25e7f2f;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 82ad244c..cc2e3a0c 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -49,13 +49,6 @@ bool can_convert(const BasicTypeDeclaration &from, const BasicTypeDeclaration &t
 
 unsigned TypeComparer::next_tag = 1;
 
-TypeComparer::TypeComparer():
-	first(0),
-	second(0),
-	first_tag(0),
-	r_result(false)
-{ }
-
 void TypeComparer::compare(Node &node1, Node &node2)
 {
 	if(&node1==&node2)
@@ -122,6 +115,49 @@ void TypeComparer::visit(VariableReference &var)
 	}
 }
 
+void TypeComparer::visit(UnaryExpression &unary)
+{
+	if(UnaryExpression *unary1 = multi_visit(unary))
+	{
+		if(unary1->oper!=unary.oper)
+			r_result = false;
+		else
+			compare(*unary1->expression, *unary.expression);
+	}
+}
+
+void TypeComparer::visit(BinaryExpression &binary)
+{
+	if(BinaryExpression *binary1 = multi_visit(binary))
+	{
+		if(binary1->oper!=binary.oper)
+			r_result = false;
+		else
+		{
+			compare(*binary1->left, *binary.left);
+			if(r_result)
+				compare(*binary1->right, *binary.right);
+		}
+	}
+}
+
+void TypeComparer::visit(TernaryExpression &ternary)
+{
+	if(TernaryExpression *ternary1 = multi_visit(ternary))
+	{
+		if(ternary1->oper!=ternary.oper)
+			r_result = false;
+		else
+		{
+			compare(*ternary1->condition, *ternary.condition);
+			if(r_result)
+				compare(*ternary1->true_expr, *ternary.true_expr);
+			if(r_result)
+				compare(*ternary1->false_expr, *ternary.false_expr);
+		}
+	}
+}
+
 void TypeComparer::visit(BasicTypeDeclaration &basic)
 {
 	if(BasicTypeDeclaration *basic1 = multi_visit(basic))
@@ -191,10 +227,6 @@ void TypeComparer::visit(VariableDeclaration &var)
 }
 
 
-LocationCounter::LocationCounter():
-	r_count(0)
-{ }
-
 void LocationCounter::visit(BasicTypeDeclaration &basic)
 {
 	r_count = basic.kind==BasicTypeDeclaration::MATRIX ? basic.size>>16 : 1;
@@ -348,6 +380,19 @@ void DependencyCollector::visit(FunctionDeclaration &func)
 	}
 }
 
+
+set<VariableDeclaration *> AssignmentCollector::apply(Node &node)
+{
+	node.visit(*this);
+	return assigned_variables;
+}
+
+void AssignmentCollector::visit(Assignment &assign)
+{
+	if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(assign.target.declaration))
+		assigned_variables.insert(var);
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp