X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=f12177db4a4236109f4060ffc72c13098f66093f;hb=9978e2f62777795bf478b301aadffdd0ee8cbd41;hp=0c4b98cbb2c8fd9de87ec21b553d911febde227a;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 0c4b98cb..f12177db 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>
@@ -254,8 +254,13 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 	}
 	else if(kind==BasicTypeDeclaration::VOID)
 		error(var, "Type 'void' not allowed on variable");
-	else if(kind==BasicTypeDeclaration::BOOL && !var.interface.empty() && var.source!=BUILTIN_SOURCE)
-		error(var, "Type 'bool' not allowed on interface variable");
+	else if(kind==BasicTypeDeclaration::BOOL && var.source!=BUILTIN_SOURCE)
+	{
+		if(scope==INTERFACE_BLOCK)
+			error(var, "Type 'bool' not allowed in an interface block");
+		else if(!var.interface.empty())
+			error(var, "Type 'bool' not allowed on interface variable");
+	}
 
 	if(var.init_expression)
 	{
@@ -492,8 +497,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)
@@ -519,7 +533,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))
@@ -609,6 +623,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)
@@ -619,12 +639,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);
 	}
 }