X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=947b310ef5e528e026dd53dcbd642de96f4923b3;hb=c701c8787cb19fbb6dc5b0bfae1a94e2b07dd549;hp=bbd364c0730d7cca157376ad34bbdbd028ec1581;hpb=911c6c4acc8218bc40d93917207f9dc32e9f2596;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index bbd364c0..947b310e 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -105,12 +105,6 @@ void Literal::visit(NodeVisitor &visitor)
 }
 
 
-void ParenthesizedExpression::visit(NodeVisitor &visitor)
-{
-	visitor.visit(*this);
-}
-
-
 VariableReference::VariableReference():
 	declaration(0)
 { }
@@ -144,14 +138,16 @@ void InterfaceBlockReference::visit(NodeVisitor &visitor)
 
 
 MemberAccess::MemberAccess():
-	declaration(0)
+	declaration(0),
+	index(-1)
 { }
 
 MemberAccess::MemberAccess(const MemberAccess &other):
 	Expression(other),
 	left(other.left),
 	member(other.member),
-	declaration(0)
+	declaration(0),
+	index(-1)
 { }
 
 void MemberAccess::visit(NodeVisitor &visitor)
@@ -375,7 +371,7 @@ InterfaceBlock::InterfaceBlock():
 InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
 	Statement(other),
 	interface(other.interface),
-	name(other.name),
+	block_name(other.block_name),
 	members(other.members),
 	instance_name(other.instance_name),
 	array(other.array),
@@ -470,6 +466,42 @@ Module::Module():
 	shared(Stage::SHARED)
 { }
 
+
+string get_unused_variable_name(const Block &block, const string &base)
+{
+	string name = base;
+
+	unsigned number = 1;
+	unsigned base_size = name.size();
+	while(1)
+	{
+		bool unused = true;
+		for(const Block *b=█ (unused && b); b=b->parent)
+			unused = !b->variables.count(name);
+		if(unused)
+			return name;
+
+		name.erase(base_size);
+		name += format("_%d", number);
+		++number;
+	}
+}
+
+int get_layout_value(const Layout &layout, const string &name, int def_value)
+{
+	for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
+		if(i->name==name)
+			return i->value;
+	return def_value;
+}
+
+void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index)
+{
+	if(target.chain_len<7)
+		target.chain[target.chain_len] = type | min<unsigned>(index, 0x3F);
+	++target.chain_len;
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp