X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=c35fa275c2b1bbadbcfbfb8f113cf68d165d4a8a;hb=6dc2da27f0831d4172fcfeba4900616fd6c844b8;hp=697ec2193ed9e022c1bd283f4405f4188ceaf8bb;hpb=0ebc82fb851d01a6d7f1fc74a4be6612bc575bb4;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 697ec219..c35fa275 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -122,6 +122,8 @@ void ProgramCompiler::process()
 		else
 			++i;
 	}
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+		finalize(*i);
 }
 
 void ProgramCompiler::import(const string &name)
@@ -185,6 +187,14 @@ bool ProgramCompiler::optimize(Stage &stage)
 	return !unused.empty();
 }
 
+void ProgramCompiler::finalize(Stage &stage)
+{
+	if(get_gl_api()==OPENGL_ES2)
+		apply<DefaultPrecisionGenerator>(stage);
+	else
+		apply<PrecisionRemover>(stage);
+}
+
 void ProgramCompiler::inject_block(Block &target, const Block &source)
 {
 	list<RefPtr<Node> >::iterator insert_point = target.body.begin();
@@ -220,6 +230,38 @@ void ProgramCompiler::Visitor::apply(Stage &s)
 }
 
 
+ProgramCompiler::BlockModifier::BlockModifier():
+	remove_node(false)
+{ }
+
+void ProgramCompiler::BlockModifier::flatten_block(Block &block)
+{
+	insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
+	remove_node = true;
+}
+
+void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefPtr<Node> >::iterator &i)
+{
+	block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
+	insert_nodes.clear();
+
+	if(remove_node)
+		block.body.erase(i++);
+	else
+		++i;
+	remove_node = false;
+}
+
+void ProgramCompiler::BlockModifier::visit(Block &block)
+{
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	{
+		(*i)->visit(*this);
+		apply_and_increment(block, i);
+	}
+}
+
+
 ProgramCompiler::Formatter::Formatter():
 	indent(0),
 	parameter_list(false),
@@ -239,12 +281,6 @@ void ProgramCompiler::Formatter::apply(ProgramSyntax::Stage &s)
 		formatted += '\n';
 	}
 
-	if(api==OPENGL_ES2)
-	{
-		if(s.type==FRAGMENT)
-			formatted += "precision mediump float;\n";
-	}
-
 	Visitor::apply(s);
 }
 
@@ -343,6 +379,11 @@ void ProgramCompiler::Formatter::visit(Import &import)
 	formatted += format("import %s;", import.module);
 }
 
+void ProgramCompiler::Formatter::visit(Precision &prec)
+{
+	formatted += format("precision %s %s;", prec.precision, prec.type);
+}
+
 void ProgramCompiler::Formatter::visit(Layout &layout)
 {
 	formatted += "layout(";
@@ -393,6 +434,8 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 		}
 		formatted += format("%s ", interface);
 	}
+	if(!var.precision.empty())
+		formatted += format("%s ", var.precision);
 	formatted += format("%s %s", var.type, var.name);
 	if(var.array)
 	{
@@ -485,8 +528,7 @@ void ProgramCompiler::Formatter::visit(Jump &jump)
 
 
 ProgramCompiler::DeclarationCombiner::DeclarationCombiner():
-	toplevel(true),
-	remove_node(false)
+	toplevel(true)
 { }
 
 void ProgramCompiler::DeclarationCombiner::visit(Block &block)
@@ -495,15 +537,7 @@ void ProgramCompiler::DeclarationCombiner::visit(Block &block)
 		return;
 
 	SetForScope<bool> set(toplevel, false);
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
-	{
-		remove_node = false;
-		(*i)->visit(*this);
-		if(remove_node)
-			block.body.erase(i++);
-		else
-			++i;
-	}
+	BlockModifier::visit(block);
 }
 
 void ProgramCompiler::DeclarationCombiner::visit(FunctionDeclaration &func)
@@ -703,38 +737,6 @@ void ProgramCompiler::FunctionResolver::visit(FunctionDeclaration &func)
 }
 
 
-ProgramCompiler::BlockModifier::BlockModifier():
-	remove_node(false)
-{ }
-
-void ProgramCompiler::BlockModifier::flatten_block(Block &block)
-{
-	insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
-	remove_node = true;
-}
-
-void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefPtr<Node> >::iterator &i)
-{
-	block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
-	insert_nodes.clear();
-
-	if(remove_node)
-		block.body.erase(i++);
-	else
-		++i;
-	remove_node = false;
-}
-
-void ProgramCompiler::BlockModifier::visit(Block &block)
-{
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
-	{
-		(*i)->visit(*this);
-		apply_and_increment(block, i);
-	}
-}
-
-
 ProgramCompiler::InterfaceGenerator::InterfaceGenerator():
 	scope_level(0)
 { }
@@ -1507,6 +1509,65 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
 }
 
 
+void ProgramCompiler::PrecisionRemover::visit(Precision &)
+{
+	remove_node = true;
+}
+
+void ProgramCompiler::PrecisionRemover::visit(VariableDeclaration &var)
+{
+	var.precision.clear();
+}
+
+
+ProgramCompiler::DefaultPrecisionGenerator::DefaultPrecisionGenerator():
+	toplevel(true)
+{ }
+
+void ProgramCompiler::DefaultPrecisionGenerator::visit(Block &block)
+{
+	if(toplevel)
+	{
+		SetForScope<bool> set(toplevel, false);
+		BlockModifier::visit(block);
+	}
+	else
+		Visitor::visit(block);
+}
+
+void ProgramCompiler::DefaultPrecisionGenerator::visit(Precision &prec)
+{
+	have_default.insert(prec.type);
+}
+
+void ProgramCompiler::DefaultPrecisionGenerator::visit(VariableDeclaration &var)
+{
+	if(var.type_declaration)
+		return;
+
+	string type = var.type;
+	if(!type.compare(0, 3, "vec") || !type.compare(0, 3, "mat"))
+		type = "float";
+	else if(!type.compare(0, 3, "ivec") || type=="uint")
+		type = "int";
+
+	if(!have_default.count(type))
+	{
+		Precision *prec = new Precision;
+		if(!type.compare(0, 7, "sampler"))
+			prec->precision = "lowp";
+		else if(stage->type==FRAGMENT)
+			prec->precision = "mediump";
+		else
+			prec->precision = "highp";
+		prec->type = type;
+		insert_nodes.push_back(prec);
+
+		have_default.insert(type);
+	}
+}
+
+
 ProgramCompiler::LegacyConverter::LegacyConverter():
 	target_api(get_gl_api()),
 	target_version(get_glsl_version()),