X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=2fa930a9df822ac369842d46045baaa8955fadd5;hb=9ec831710f64a62ad5f2e896a55ae82a3519f29e;hp=c073d870ac4d779591fa2c896724737a5de278ca;hpb=7daccf2582084283a9e5064995f674eef835996e;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index c073d870..2fa930a9 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -1,4 +1,6 @@
+#include <msp/core/hash.h>
 #include <msp/core/raii.h>
+#include <msp/strings/lexicalcast.h>
 #include "builtin.h"
 #include "generate.h"
 
@@ -22,20 +24,6 @@ void DeclarationCombiner::visit(Block &block)
 	TraversingVisitor::visit(block);
 }
 
-void DeclarationCombiner::visit(FunctionDeclaration &func)
-{
-	vector<FunctionDeclaration *> &decls = functions[func.name];
-	if(func.definition)
-	{
-		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
-		{
-			(*i)->definition = func.definition;
-			(*i)->body.body.clear();
-		}
-	}
-	decls.push_back(&func);
-}
-
 void DeclarationCombiner::visit(VariableDeclaration &var)
 {
 	VariableDeclaration *&ptr = variables[var.name];
@@ -73,7 +61,54 @@ void DeclarationCombiner::visit(VariableDeclaration &var)
 }
 
 
-void BlockResolver::enter(Block &block)
+ConstantSpecializer::ConstantSpecializer():
+	values(0)
+{ }
+
+void ConstantSpecializer::apply(Stage &stage, const map<string, int> *v)
+{
+	values = v;
+	stage.content.visit(*this);
+}
+
+void ConstantSpecializer::visit(VariableDeclaration &var)
+{
+	bool specializable = false;
+	if(var.layout)
+	{
+		vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
+		for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
+			if(i->name=="constant_id")
+			{
+				specializable = true;
+				if(values)
+					qualifiers.erase(i);
+				else if(i->value==-1)
+					i->value = hash32(var.name)&0x7FFFFFFF;
+				break;
+			}
+
+		if(qualifiers.empty())
+			var.layout = 0;
+	}
+
+	if(specializable && values)
+	{
+		map<string, int>::const_iterator i = values->find(var.name);
+		if(i!=values->end())
+		{
+			RefPtr<Literal> literal = new Literal;
+			if(var.type=="bool")
+				literal->token = (i->second ? "true" : "false");
+			else if(var.type=="int")
+				literal->token = lexical_cast<string>(i->second);
+			var.init_expression = literal;
+		}
+	}
+}
+
+
+void BlockHierarchyResolver::enter(Block &block)
 {
 	block.parent = current_block;
 }
@@ -81,7 +116,6 @@ void BlockResolver::enter(Block &block)
 
 VariableResolver::VariableResolver():
 	stage(0),
-	builtins(0),
 	members(0),
 	record_target(false),
 	assignment_target(0),
@@ -91,16 +125,11 @@ VariableResolver::VariableResolver():
 void VariableResolver::apply(Stage &s)
 {
 	stage = &s;
-	Stage *builtin_stage = get_builtins(s.type);
-	builtins = (builtin_stage ? &builtin_stage->content : 0);
+	s.types.clear();
+	s.interface_blocks.clear();
 	s.content.visit(*this);
 }
 
-Block *VariableResolver::next_block(Block &block)
-{
-	return block.parent ? block.parent : &block!=builtins ? builtins : 0;
-}
-
 void VariableResolver::enter(Block &block)
 {
 	block.variables.clear();
@@ -110,7 +139,7 @@ void VariableResolver::visit(VariableReference &var)
 {
 	var.declaration = 0;
 	members = 0;
-	for(Block *block=current_block; (!var.declaration && block); block=next_block(*block))
+	for(Block *block=current_block; (!var.declaration && block); block=block->parent)
 	{
 		map<string, VariableDeclaration *>::iterator i = block->variables.find(var.name);
 		if(i!=block->variables.end())
@@ -162,7 +191,7 @@ void VariableResolver::visit(VariableReference &var)
 void VariableResolver::visit(InterfaceBlockReference &iface)
 {
 	iface.declaration = 0;
-	for(Block *block=current_block; block; block=next_block(*block))
+	for(Block *block=current_block; block; block=block->parent)
 	{
 		map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find(iface.name);
 		if(i!=stage->interface_blocks.end())
@@ -268,29 +297,44 @@ void VariableResolver::visit(InterfaceBlock &iface)
 }
 
 
+void FunctionResolver::apply(Stage &s)
+{
+	stage = &s;
+	s.functions.clear();
+	s.content.visit(*this);
+}
+
 void FunctionResolver::visit(FunctionCall &call)
 {
-	map<string, vector<FunctionDeclaration *> >::iterator i = functions.find(call.name);
-	if(i!=functions.end())
-		call.declaration = i->second.back();
+	map<string, FunctionDeclaration *>::iterator i = stage->functions.find(call.name);
+	if(i!=stage->functions.end())
+		call.declaration = i->second;
 
 	TraversingVisitor::visit(call);
 }
 
 void FunctionResolver::visit(FunctionDeclaration &func)
 {
-	vector<FunctionDeclaration *> &decls = functions[func.name];
-	if(func.definition)
+	FunctionDeclaration *&stage_decl = stage->functions[func.name];
+	vector<FunctionDeclaration *> &decls = declarations[func.name];
+	if(func.definition==&func)
 	{
+		stage_decl = &func;
+
 		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
+		{
 			(*i)->definition = func.definition;
-		decls.clear();
-		decls.push_back(&func);
+			(*i)->body.body.clear();
+		}
 	}
-	else if(!decls.empty() && decls.back()->definition)
-		func.definition = decls.back()->definition;
 	else
-		decls.push_back(&func);
+	{
+		if(!stage_decl)
+			stage_decl = &func;
+
+		func.definition = stage_decl->definition;
+	}
+	decls.push_back(&func);
 
 	TraversingVisitor::visit(func);
 }
@@ -363,6 +407,7 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri
 		iface_var->array_size = var.array_size;
 	if(iface=="in")
 	{
+		iface_var->layout = var.layout;
 		iface_var->linked_declaration = &var;
 		var.linked_declaration = iface_var;
 	}