X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=cc427d05c30c3f9d66a32556d4ee2c5aa8d042d5;hb=08d3b5a55fad7439b47fc93d8ba604cbeb7e19ca;hp=0a9e8e85a81380977cdf6cbc27f767d61fcf4ebc;hpb=03b2ea5c9c611cfa5f02afb49ed7e05743e691b4;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 0a9e8e85..cc427d05 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -108,8 +108,15 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 	iface_var->interface = iface;
 	iface_var->type = var.type;
 	iface_var->name = name;
-	// Geometry shader inputs are always arrays.
-	if(stage->type==Stage::GEOMETRY)
+	// Tessellation and geometry inputs may be arrayed.
+	if(stage->type==Stage::TESS_CONTROL)
+		// VS out -> TCS in: add | TCS in -> TCS out: unchanged | VS out -> TCS out: add
+		iface_var->array = (var.array || var.interface!="in");
+	else if(stage->type==Stage::TESS_EVAL)
+		// TCS out -> TES in: unchanged | TES in -> TES out: remove | TCS out -> TES out: remove
+		iface_var->array = (var.array && iface=="in");
+	else if(stage->type==Stage::GEOMETRY)
+		// VS/TES out -> GS in: add | GS in -> GS out: remove | VS/TES out -> GS out: unchanged
 		iface_var->array = ((var.array && var.interface!="in") || iface=="in");
 	else
 		iface_var->array = var.array;
@@ -203,7 +210,7 @@ void InterfaceGenerator::visit(VariableReference &var)
 	}
 
 	for(const auto &kvp: stage->previous->interface_blocks)
-		if(kvp.first.find(' ')!=string::npos)
+		if(kvp.second->name.find(' ')!=string::npos)
 		{
 			const map<string, VariableDeclaration *> &iface_vars = kvp.second->block_declaration->members.variables;
 			i = iface_vars.find(var.name);
@@ -338,6 +345,151 @@ void InterfaceGenerator::visit(Passthrough &pass)
 	nodes_to_remove.insert(&pass);
 }
 
+
+void LayoutDefaulter::apply(Stage &stage)
+{
+	if(stage.type==Stage::TESS_EVAL)
+	{
+		stage.content.visit(*this);
+		if((need_winding || need_spacing) && in_iface)
+		{
+			if(need_winding)
+				in_iface->layout.qualifiers.emplace_back("ccw");
+			if(need_spacing)
+				in_iface->layout.qualifiers.emplace_back("equal_spacing");
+		}
+	}
+}
+
+void LayoutDefaulter::visit(InterfaceLayout &iface)
+{
+	if(iface.interface=="in")
+	{
+		if(!in_iface)
+			in_iface = &iface;
+		for(const Layout::Qualifier &q: iface.layout.qualifiers)
+		{
+			if(q.name=="cw" || q.name=="ccw")
+				need_winding = false;
+			else if(q.name=="equal_spacing" || q.name=="fractional_even_spacing" || q.name=="fractional_odd_spacing")
+				need_spacing = false;
+		}
+	}
+}
+
+
+void ArraySizer::apply(Stage &stage)
+{
+	stage.content.visit(*this);
+	for(const auto &kvp: max_indices)
+		if(kvp.first->array && !kvp.first->array_size)
+		{
+			int size = 0;
+			if(stage.type==Stage::GEOMETRY && kvp.first->interface=="in")
+				size = input_size;
+			else if(kvp.second>=0)
+				size = kvp.second+1;
+			if(!size && !kvp.first->name.compare(0, 3, "gl_"))
+				size = 1;
+
+			if(size>0)
+			{
+				Literal *literal_size = new Literal;
+				literal_size->token = lexical_cast<string>(size);
+				literal_size->value = size;
+				kvp.first->array_size = literal_size;
+			}
+		}
+}
+
+void ArraySizer::visit(VariableReference &var)
+{
+	r_declaration = var.declaration;
+}
+
+void ArraySizer::visit(MemberAccess &memacc)
+{
+	r_declaration = 0;
+	TraversingVisitor::visit(memacc);
+	VariableDeclaration *member_declaration = 0;
+	if(r_declaration)
+		if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(r_declaration->type_declaration))
+		{
+			auto i = strct->members.variables.find(memacc.member);
+			if(i!=strct->members.variables.end())
+				member_declaration = i->second;
+		}
+	r_declaration = member_declaration;
+}
+
+void ArraySizer::visit(Swizzle &swizzle)
+{
+	TraversingVisitor::visit(swizzle);
+	r_declaration = 0;
+}
+
+void ArraySizer::visit(UnaryExpression &unary)
+{
+	TraversingVisitor::visit(unary);
+	r_declaration = 0;
+}
+
+void ArraySizer::visit(BinaryExpression &binary)
+{
+	if(binary.oper->token[0]=='[')
+		if(const Literal *literal_index = dynamic_cast<const Literal *>(binary.right.get()))
+			if(literal_index->value.check_type<int>())
+			{
+				r_declaration = 0;
+				binary.left->visit(*this);
+				if(r_declaration)
+				{
+					max_indices[r_declaration] = literal_index->value.value<int>();
+					return;
+				}
+			}
+
+	TraversingVisitor::visit(binary);
+}
+
+void ArraySizer::visit(TernaryExpression &ternary)
+{
+	TraversingVisitor::visit(ternary);
+	r_declaration = 0;
+}
+
+void ArraySizer::visit(FunctionCall &call)
+{
+	TraversingVisitor::visit(call);
+	r_declaration = 0;
+}
+
+void ArraySizer::visit(InterfaceLayout &layout)
+{
+	if(layout.interface=="in")
+	{
+		for(const Layout::Qualifier &q: layout.layout.qualifiers)
+		{
+			if(q.name=="points")
+				input_size = 1;
+			else if(q.name=="lines")
+				input_size = 2;
+			else if(q.name=="triangles")
+				input_size = 3;
+			else if(q.name=="lines_adjacency")
+				input_size = 4;
+			else if(q.name=="triangles_adjacency")
+				input_size = 6;
+		}
+	}
+}
+
+void ArraySizer::visit(VariableDeclaration &var)
+{
+	if(var.array && !var.array_size)
+		max_indices[&var] = 0;
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp