X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=d28de156c5a881fede9fb116052370102338c80a;hp=973ff8324ac927bdb0d282ff23edf6f7259565c5;hb=08d3b5a55fad7439b47fc93d8ba604cbeb7e19ca;hpb=05597fbb3671dfed4776bc5223958c85e780345e

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 973ff832..d28de156 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -8,35 +8,40 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Formatter::Formatter():
-	stage(0),
-	source_index(0),
-	source_line(1),
-	indent(0),
-	parameter_list(false)
-{ }
-
-const string &Formatter::apply(Stage &s)
+string Formatter::apply(Stage &s)
 {
 	stage = &s;
+	omit_builtin = true;
 
-	GLApi api = get_gl_api();
-	const Version &ver = s.required_version;
+	const Version &ver = s.required_features.glsl_version;
 
 	if(ver)
 	{
 		append(format("#version %d%02d", ver.major, ver.minor));
-		if(api==OPENGL_ES2 && ver>=Version(3, 0))
+		if(s.required_features.target_api==OPENGL_ES && ver>=Version(3, 0))
 			append(" es");
 		formatted += '\n';
 	}
 
-	for(vector<const Extension *>::const_iterator i=s.required_extensions.begin(); i!=s.required_extensions.end(); ++i)
-		append(format("#extension %s: require\n", (*i)->get_name()));
-	if(!s.required_extensions.empty())
-		formatted += '\n';
-
-	visit(s.content);
+	if(s.required_features.arb_enhanced_layouts)
+		append("#extension GL_ARB_enhanced_layouts: require\n");
+	if(s.required_features.arb_explicit_attrib_location)
+		append("#extension GL_ARB_explicit_attrib_location: require\n");
+	if(s.required_features.arb_explicit_uniform_location)
+		append("#extension GL_ARB_explicit_uniform_location: require\n");
+	if(s.required_features.arb_gpu_shader5)
+		append("#extension GL_ARB_gpu_shader5: require\n");
+	if(s.required_features.arb_separate_shader_objects)
+		append("#extension GL_ARB_separate_shader_objects: require\n");
+	if(s.required_features.arb_uniform_buffer_object)
+		append("#extension GL_ARB_uniform_buffer_object: require\n");
+	if(s.required_features.ext_gpu_shader4)
+		append("#extension GL_EXT_gpu_shader4: require\n");
+	if(s.required_features.ext_texture_array)
+		append("#extension GL_EXT_texture_array: require\n");
+	formatted += '\n';
+
+	s.content.visit(*this);
 
 	return formatted;
 }
@@ -44,8 +49,8 @@ const string &Formatter::apply(Stage &s)
 void Formatter::append(const string &text)
 {
 	formatted += text;
-	for(string::const_iterator i=text.begin(); i!=text.end(); ++i)
-		if(*i=='\n')
+	for(char c: text)
+		if(c=='\n')
 			++source_line;
 }
 
@@ -65,7 +70,7 @@ void Formatter::set_source(unsigned index, unsigned line)
 		else
 		{
 			unsigned l = line;
-			if(stage->required_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);
 		}
@@ -74,57 +79,130 @@ void Formatter::set_source(unsigned index, unsigned line)
 	source_line = line;
 }
 
-void Formatter::visit(Literal &literal)
+void Formatter::visit(Block &block)
 {
-	append(literal.token);
+	unsigned brace_indent = indent;
+	bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
+	if(use_braces)
+		append(format("%s{\n", string(brace_indent*2, ' ')));
+
+	SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
+	string spaces(indent*2, ' ');
+	bool first = true;
+	for(const RefPtr<Statement> &s: block.body)
+	{
+		if(omit_builtin && s->source<=BUILTIN_SOURCE)
+			continue;
+		if(!first)
+			append('\n');
+		first = false;
+		set_source(s->source, s->line);
+		append(spaces);
+		s->visit(*this);
+	}
+
+	if(use_braces)
+		append(format("\n%s}", string(brace_indent*2, ' ')));
 }
 
-void Formatter::visit(ParenthesizedExpression &parexpr)
+void Formatter::visit_expression(Expression &expr, const Operator *outer_oper, bool on_rhs)
 {
-	append('(');
-	parexpr.expression->visit(*this);
-	append(')');
+	unsigned outer_precedence = (outer_oper ? outer_oper->precedence : 20);
+	unsigned inner_precedence = (expr.oper ? expr.oper->precedence : 0);
+
+	bool needs_parentheses = (inner_precedence>=outer_precedence);
+
+	// Omit parentheses if the outer operator encloses this operand.
+	if(outer_oper && outer_oper->type==Operator::BINARY && outer_oper->token2[0] && on_rhs)
+		needs_parentheses = false;
+
+	if(expr.oper)
+	{
+		/* Omit parentheses if the inner expression's operator sits between the
+		expression and the outer operator. */
+		bool oper_on_left = expr.oper->type==Operator::PREFIX;
+		bool oper_on_right = expr.oper->type==Operator::POSTFIX || (expr.oper->type==Operator::BINARY && expr.oper->token2[0]);
+		if(expr.oper && ((oper_on_left && on_rhs) || (oper_on_right && !on_rhs)))
+			needs_parentheses = false;
+
+		// Omit parentheses if the operator's natural grouping works out.
+		if(expr.oper==outer_oper)
+			needs_parentheses = (expr.oper->assoc!=Operator::ASSOCIATIVE && on_rhs!=(expr.oper->assoc==Operator::RIGHT_TO_LEFT));
+	}
+
+	if(needs_parentheses)
+		append('(');
+	expr.visit(*this);
+	if(needs_parentheses)
+		append(')');
+}
+
+void Formatter::visit(Literal &literal)
+{
+	append(literal.token);
 }
 
 void Formatter::visit(VariableReference &var)
 {
-	append(var.name);
+	r_empty_name = var.name.find(' ')!=string::npos;
+	if(!r_empty_name)
+		append(var.name);
 }
 
 void Formatter::visit(MemberAccess &memacc)
 {
-	memacc.left->visit(*this);
-	append(format(".%s", memacc.member));
+	visit_expression(*memacc.left, memacc.oper, false);
+	if(!r_empty_name)
+		append('.');
+	append(memacc.member);
+	r_empty_name = false;
+}
+
+void Formatter::visit(Swizzle &swizzle)
+{
+	visit_expression(*swizzle.left, swizzle.oper, false);
+	append(format(".%s", swizzle.component_group));
 }
 
 void Formatter::visit(UnaryExpression &unary)
 {
-	if(unary.prefix)
-		append(unary.oper);
-	unary.expression->visit(*this);
-	if(!unary.prefix)
-		append(unary.oper);
+	if(unary.oper->type==Operator::PREFIX)
+		append(unary.oper->token);
+	visit_expression(*unary.expression, unary.oper, unary.oper->type==Operator::PREFIX);
+	if(unary.oper->type==Operator::POSTFIX)
+		append(unary.oper->token);
 }
 
 void Formatter::visit(BinaryExpression &binary)
 {
-	binary.left->visit(*this);
-	append(binary.oper);
-	binary.right->visit(*this);
-	append(binary.after);
+	visit_expression(*binary.left, binary.oper, false);
+	append(binary.oper->token);
+	visit_expression(*binary.right, binary.oper, true);
+	if(binary.oper->token2[0])
+		append(binary.oper->token2);
 }
 
 void Formatter::visit(Assignment &assign)
 {
-	assign.left->visit(*this);
-	append(format(" %s ", assign.oper));
-	assign.right->visit(*this);
+	visit_expression(*assign.left, assign.oper, false);
+	append(format(" %s ", assign.oper->token));
+	visit_expression(*assign.right, assign.oper, true);
+}
+
+void Formatter::visit(TernaryExpression &ternary)
+{
+	visit_expression(*ternary.condition, ternary.oper, false);
+	append(ternary.oper->token);
+	visit_expression(*ternary.true_expr, ternary.oper, false);
+	if(ternary.oper->token2[0])
+		append(ternary.oper->token2);
+	visit_expression(*ternary.false_expr, ternary.oper, true);
 }
 
 void Formatter::visit(FunctionCall &call)
 {
 	append(format("%s(", call.name));
-	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+	for(auto i=call.arguments.begin(); i!=call.arguments.end(); ++i)
 	{
 		if(i!=call.arguments.begin())
 			append(", ");
@@ -139,28 +217,6 @@ void Formatter::visit(ExpressionStatement &expr)
 	append(';');
 }
 
-void Formatter::visit(Block &block)
-{
-	unsigned brace_indent = indent;
-	bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
-	if(use_braces)
-		append(format("%s{\n", string(brace_indent*2, ' ')));
-
-	SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
-	string spaces(indent*2, ' ');
-	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
-	{
-		if(i!=block.body.begin())
-			append('\n');
-		set_source((*i)->source, (*i)->line);
-		append(spaces);
-		(*i)->visit(*this);
-	}
-
-	if(use_braces)
-		append(format("\n%s}", string(brace_indent*2, ' ')));
-}
-
 void Formatter::visit(Import &import)
 {
 	append(format("import %s;", import.module));
@@ -174,13 +230,13 @@ void Formatter::visit(Precision &prec)
 void Formatter::visit(Layout &layout)
 {
 	append("layout(");
-	for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
+	for(auto i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
 	{
 		if(i!=layout.qualifiers.begin())
 			append(", ");
-		append(i->identifier);
-		if(!i->value.empty())
-			append(format("=%s", i->value));
+		append(i->name);
+		if(i->has_value)
+			append(format("=%d", i->value));
 	}
 	append(')');
 }
@@ -193,6 +249,9 @@ void Formatter::visit(InterfaceLayout &layout)
 
 void Formatter::visit(StructDeclaration &strct)
 {
+	if(!strct.block_name.empty())
+		return;
+
 	append(format("struct %s\n", strct.name));
 	strct.members.visit(*this);
 	append(';');
@@ -211,10 +270,10 @@ void Formatter::visit(VariableDeclaration &var)
 		append(format("%s ", var.interpolation));
 	if(!var.sampling.empty())
 		append(format("%s ", var.sampling));
-	if(!var.interface.empty() && var.interface!=block_interface)
+	if(!var.interface.empty())
 	{
 		string interface = var.interface;
-		if(stage->required_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";
@@ -225,7 +284,25 @@ void Formatter::visit(VariableDeclaration &var)
 	}
 	if(!var.precision.empty())
 		append(format("%s ", var.precision));
-	append(format("%s %s", var.type, var.name));
+
+	if(var.block_declaration)
+	{
+		append(format("%s\n", var.block_declaration->block_name));
+		var.block_declaration->members.visit(*this);
+		if(var.name.find(' ')==string::npos)
+			append(format(" %s", var.name));
+	}
+	else
+	{
+		string type_name = var.type_declaration->name;
+		if(const ImageTypeDeclaration *image = dynamic_cast<const ImageTypeDeclaration *>(var.type_declaration))
+			if(image->base_image)
+				type_name = image->base_image->name;
+		if(var.array)
+			type_name = type_name.substr(0, type_name.find('['));
+		append(format("%s %s", type_name, var.name));
+	}
+
 	if(var.array)
 	{
 		append('[');
@@ -242,18 +319,10 @@ void Formatter::visit(VariableDeclaration &var)
 		append(';');
 }
 
-void Formatter::visit(InterfaceBlock &iface)
-{
-	SetForScope<string> set(block_interface, iface.interface);
-	append(format("%s %s\n", iface.interface, iface.name));
-	iface.members.visit(*this);
-	append(';');
-}
-
 void Formatter::visit(FunctionDeclaration &func)
 {
-	append(format("%s %s(", func.return_type, func.name));
-	for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+	append(format("%s %s(", func.return_type_declaration->name, func.name));
+	for(auto i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 	{
 		if(i!=func.parameters.begin())
 			append(", ");
@@ -333,6 +402,18 @@ void Formatter::visit(Iteration &iter)
 	}
 }
 
+void Formatter::visit(Passthrough &pass)
+{
+	append("passthrough");
+	if(pass.subscript)
+	{
+		append('[');
+		pass.subscript->visit(*this);
+		append(']');
+	}
+	append(';');
+}
+
 void Formatter::visit(Return &ret)
 {
 	append("return");