X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=2da8345de4a7002e0020d98fe536443c72b8cba6;hb=6997ed1c07c382c0f66c57c080934ad53e1d3713;hp=ec322f4207751af90482893dc21dc4f4dce39e0a;hpb=f4460c27a4d19ffb34017b92389420adad44d051;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index ec322f42..2da8345d 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <cstring>
+#include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
@@ -49,6 +49,8 @@ const char *DeclarationValidator::describe_variable(ScopeType scope)
 
 void DeclarationValidator::visit(Layout &layout)
 {
+	bool push_constant = false;
+	bool binding = false;
 	for(const Layout::Qualifier &q: layout.qualifiers)
 	{
 		bool allowed = false;
@@ -58,6 +60,8 @@ void DeclarationValidator::visit(Layout &layout)
 			allowed = (variable && scope==GLOBAL);
 		else if(q.name=="binding" || q.name=="set")
 		{
+			binding = true;
+
 			if(q.name=="set")
 			{
 				error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL");
@@ -141,6 +145,12 @@ void DeclarationValidator::visit(Layout &layout)
 				err_descr = "non-matrix variable";
 			}
 		}
+		else if(q.name=="push_constant")
+		{
+			push_constant = true;
+			allowed = (iface_block && !variable && iface_block->interface=="uniform");
+			value = false;
+		}
 
 		if(!allowed)
 		{
@@ -162,6 +172,9 @@ void DeclarationValidator::visit(Layout &layout)
 		else if(!value && q.has_value)
 			error(layout, format("Layout qualifier '%s' does not allow a value", q.name));
 	}
+
+	if(push_constant && binding)
+		error(layout, "Layout qualifier 'push_constant' not allowed together with 'binding' or 'set'");
 }
 
 void DeclarationValidator::visit(InterfaceLayout &layout)
@@ -497,8 +510,17 @@ void ReferenceValidator::visit(FunctionDeclaration &func)
 
 void ExpressionValidator::visit(VariableReference &var)
 {
-	if(var.declaration && constant_expression && !var.declaration->constant)
-		error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+	if(var.declaration && constant_expression)
+	{
+		if(!var.declaration->constant)
+			error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+		else if(var.declaration->layout && constant_expression==FIXED_CONSTANT)
+		{
+			auto i = find_member(var.declaration->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+			if(i!=var.declaration->layout->qualifiers.end())
+				error(var, format("Reference to specialization constant '%s' in a fixed constant expression", var.name));
+		}
+	}
 }
 
 void ExpressionValidator::visit(InterfaceBlockReference &iface)
@@ -524,7 +546,7 @@ void ExpressionValidator::visit(Swizzle &swizzle)
 		int flavour = -1;
 		for(unsigned i=0; i<swizzle.count; ++i)
 		{
-			unsigned component_flavour = (find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
+			unsigned component_flavour = (std::find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
 			if(flavour==-1)
 				flavour = component_flavour;
 			else if(flavour>=0 && component_flavour!=static_cast<unsigned>(flavour))
@@ -614,6 +636,12 @@ void ExpressionValidator::visit(TernaryExpression &ternary)
 	TraversingVisitor::visit(ternary);
 }
 
+void ExpressionValidator::visit(StructDeclaration &strct)
+{
+	SetFlag set_struct(in_struct);
+	TraversingVisitor::visit(strct);
+}
+
 void ExpressionValidator::visit(VariableDeclaration &var)
 {
 	if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)
@@ -624,12 +652,20 @@ void ExpressionValidator::visit(VariableDeclaration &var)
 		var.layout->visit(*this);
 	if(var.init_expression)
 	{
-		SetFlag set_const(constant_expression, var.constant);
+		ConstantKind const_kind = (var.constant ? SPEC_CONSTANT : NOT_CONSTANT);
+		if(var.layout)
+		{
+			auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+			if(i!=var.layout->qualifiers.end())
+				const_kind = FIXED_CONSTANT;
+		}
+
+		SetForScope<ConstantKind> set_const(constant_expression, const_kind);
 		TraversingVisitor::visit(var.init_expression);
 	}
 	if(var.array_size)
 	{
-		SetFlag set_const(constant_expression);
+		SetForScope<ConstantKind> set_const(constant_expression, (in_struct || !var.interface.empty() ? FIXED_CONSTANT : SPEC_CONSTANT));
 		TraversingVisitor::visit(var.array_size);
 	}
 }