X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=c670bc1a814ee1002eac71285c9002fe568c1968;hp=ab487a44c470bca769af032b9ce2966c7a0df5d2;hb=91e2fb59219089ac0f16bc49152c20be42a14cc5;hpb=9229a3e70dace406d897148857ed6567986c3bcd

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index ab487a44..c670bc1a 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -12,57 +12,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void DeclarationCombiner::apply(Stage &stage)
-{
-	stage.content.visit(*this);
-	NodeRemover().apply(stage, nodes_to_remove);
-}
-
-void DeclarationCombiner::visit(Block &block)
-{
-	if(current_block)
-		return;
-
-	TraversingVisitor::visit(block);
-}
-
-void DeclarationCombiner::visit(VariableDeclaration &var)
-{
-	VariableDeclaration *&ptr = variables[var.name];
-	if(ptr)
-	{
-		ptr->type = var.type;
-		if(var.init_expression)
-			ptr->init_expression = var.init_expression;
-		if(var.layout)
-		{
-			if(ptr->layout)
-			{
-				for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
-				{
-					bool found = false;
-					for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
-						if(j->name==i->name)
-						{
-							j->has_value = i->value;
-							j->value = i->value;
-							found = true;
-						}
-
-					if(!found)
-						ptr->layout->qualifiers.push_back(*i);
-				}
-			}
-			else
-				ptr->layout = var.layout;
-		}
-		nodes_to_remove.insert(&var);
-	}
-	else
-		ptr = &var;
-}
-
-
 ConstantSpecializer::ConstantSpecializer():
 	values(0)
 { }
@@ -270,6 +219,9 @@ bool VariableResolver::apply(Stage &s)
 	s.interface_blocks.clear();
 	r_any_resolved = false;
 	s.content.visit(*this);
+	for(vector<VariableDeclaration *>::const_iterator i=redeclared_builtins.begin(); i!=redeclared_builtins.end(); ++i)
+		(*i)->source = GENERATED_SOURCE;
+	NodeRemover().apply(s, nodes_to_remove);
 	return r_any_resolved;
 }
 
@@ -485,10 +437,51 @@ void VariableResolver::visit(Assignment &assign)
 	assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
 }
 
+void VariableResolver::merge_layouts(Layout &to_layout, const Layout &from_layout)
+{
+	for(vector<Layout::Qualifier>::const_iterator i=from_layout.qualifiers.begin(); i!=from_layout.qualifiers.end(); ++i)
+	{
+		bool found = false;
+		for(vector<Layout::Qualifier>::iterator j=to_layout.qualifiers.begin(); (!found && j!=to_layout.qualifiers.end()); ++j)
+			if(j->name==i->name)
+			{
+				j->has_value = i->value;
+				j->value = i->value;
+				found = true;
+			}
+
+		if(!found)
+			to_layout.qualifiers.push_back(*i);
+	}
+}
+
 void VariableResolver::visit(VariableDeclaration &var)
 {
 	TraversingVisitor::visit(var);
-	current_block->variables.insert(make_pair(var.name, &var));
+	VariableDeclaration *&ptr = current_block->variables[var.name];
+	if(!ptr)
+		ptr = &var;
+	else if(!current_block->parent && ptr->interface==var.interface && ptr->type==var.type)
+	{
+		if(ptr->source==BUILTIN_SOURCE)
+			redeclared_builtins.push_back(&var);
+		else
+			stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+				format("Redeclaring non-builtin variable '%s' is deprecated", var.name)));
+
+		if(var.init_expression)
+			ptr->init_expression = var.init_expression;
+		if(var.layout)
+		{
+			if(ptr->layout)
+				merge_layouts(*ptr->layout, *var.layout);
+			else
+				ptr->layout = var.layout;
+		}
+		nodes_to_remove.insert(&var);
+
+		r_any_resolved = true;
+	}
 }
 
 void VariableResolver::visit(InterfaceBlock &iface)
@@ -872,6 +865,36 @@ void ExpressionResolver::visit(Assignment &assign)
 	resolve(assign, assign.left->type, true);
 }
 
+void ExpressionResolver::visit(TernaryExpression &ternary)
+{
+	TraversingVisitor::visit(ternary);
+
+	BasicTypeDeclaration *basic_cond = dynamic_cast<BasicTypeDeclaration *>(ternary.condition->type);
+	if(!basic_cond || basic_cond->kind!=BasicTypeDeclaration::BOOL)
+		return;
+
+	TypeDeclaration *type = 0;
+	if(ternary.true_expr->type==ternary.false_expr->type)
+		type = ternary.true_expr->type;
+	else
+	{
+		BasicTypeDeclaration *basic_true = dynamic_cast<BasicTypeDeclaration *>(ternary.true_expr->type);
+		BasicTypeDeclaration *basic_false = dynamic_cast<BasicTypeDeclaration *>(ternary.false_expr->type);
+		Compatibility compat = get_compatibility(*basic_true, *basic_false);
+		if(compat==NOT_COMPATIBLE)
+			return;
+
+		type = (compat==LEFT_CONVERTIBLE ? basic_true : basic_false);
+
+		if(compat==LEFT_CONVERTIBLE)
+			convert_to(ternary.true_expr, *basic_false);
+		else if(compat==RIGHT_CONVERTIBLE)
+			convert_to(ternary.false_expr, *basic_true);
+	}
+
+	resolve(ternary, type, false);
+}
+
 void ExpressionResolver::visit(FunctionCall &call)
 {
 	TraversingVisitor::visit(call);
@@ -1201,7 +1224,8 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
 	}
 	else if(var.interface=="in" && current_block==&stage->content)
 	{
-		declared_inputs.push_back(&var);
+		if(var.name.compare(0, 3, "gl_"))
+			declared_inputs.push_back(&var);
 
 		/* Try to link input variables in global scope with output variables from
 		previous stage. */