X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=635d9f15dcec1b6720a13df6285d83a6e329c3aa;hb=b6c4e1a794276ca343c0c9bb0a300e729ca41931;hp=99253fe041463ce01a852f340b967cb744f33a50;hpb=6211e1556df8345ad1c4e7edbd635bccdd7f54f0;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 99253fe0..635d9f15 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -2,6 +2,7 @@
 #include <msp/core/hash.h>
 #include <msp/core/raii.h>
 #include "generate.h"
+#include "reflect.h"
 
 using namespace std;
 
@@ -105,11 +106,23 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 
 	VariableDeclaration* iface_var = new VariableDeclaration;
 	iface_var->sampling = var.sampling;
+	if(stage->type==Stage::FRAGMENT && iface=="in")
+		if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(var.type_declaration))
+			if(BasicTypeDeclaration *elem = get_element_type(*basic))
+				if(elem->kind==BasicTypeDeclaration::INT)
+					iface_var->interpolation = "flat";
 	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;
@@ -339,6 +352,38 @@ void InterfaceGenerator::visit(Passthrough &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);
@@ -350,7 +395,7 @@ void ArraySizer::apply(Stage &stage)
 				size = input_size;
 			else if(kvp.second>=0)
 				size = kvp.second+1;
-			else if(!kvp.first->name.compare(0, 3, "gl_"))
+			if(!size && !kvp.first->name.compare(0, 3, "gl_"))
 				size = 1;
 
 			if(size>0)