X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=718b1a8bcde406ec124f7959f314b606361c1d2a;hb=3e24a1bfd5a259b185ff0f37046dd0489e1908a3;hp=52371d1bfdd79f9f7de91ff457d10001952f6c62;hpb=041ba4b1acd55337239c5ce24cc310118c621206;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 52371d1b..718b1a8b 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -10,17 +10,17 @@ namespace SL {
 
 Formatter::Formatter():
 	stage(0),
-	mode(Compiler::PROGRAM),
 	source_index(0),
 	source_line(1),
 	indent(0),
-	parameter_list(false)
+	parameter_list(false),
+	omit_builtin(false)
 { }
 
-const string &Formatter::apply(Stage &s, Compiler::Mode m)
+const string &Formatter::apply(Stage &s)
 {
-	mode = m;
 	stage = &s;
+	omit_builtin = true;
 
 	const Version &ver = s.required_features.glsl_version;
 
@@ -73,7 +73,7 @@ void Formatter::set_source(unsigned index, unsigned line)
 		else
 		{
 			unsigned l = line;
-			if(mode==Compiler::PROGRAM && stage && stage->required_features.glsl_version<Version(3, 30))
+			if(stage && stage->required_features.glsl_version && stage->required_features.glsl_version<Version(3, 30))
 				--l;
 			formatted += format("#line %d %d\n", l, index);
 		}
@@ -94,7 +94,7 @@ void Formatter::visit(Block &block)
 	bool first = true;
 	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
-		if((*i)->source<=BUILTIN_SOURCE)
+		if(omit_builtin && (*i)->source<=BUILTIN_SOURCE)
 			continue;
 		if(!first)
 			append('\n');
@@ -136,6 +136,12 @@ void Formatter::visit(MemberAccess &memacc)
 	append(format(".%s", memacc.member));
 }
 
+void Formatter::visit(Swizzle &swizzle)
+{
+	swizzle.left->visit(*this);
+	append(format(".%s", swizzle.component_group));
+}
+
 void Formatter::visit(UnaryExpression &unary)
 {
 	if(unary.oper->type==Operator::PREFIX)
@@ -232,7 +238,7 @@ void Formatter::visit(VariableDeclaration &var)
 	if(!var.interface.empty())
 	{
 		string interface = var.interface;
-		if(mode==Compiler::PROGRAM && stage && stage->required_features.glsl_version<Version(1, 30))
+		if(stage && stage->required_features.glsl_version && stage->required_features.glsl_version<Version(1, 30))
 		{
 			if(stage->type==Stage::VERTEX && var.interface=="in")
 				interface = "attribute";