X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=6a4b8eb0dc0e34ced99b82fcc08d41c22c569bf0;hb=efbce87192ce73ba577684369f759693dccec67c;hp=f12177db4a4236109f4060ffc72c13098f66093f;hpb=2e9d0beaafa8220d8a917749c8a12beaf4718729;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index f12177db..6a4b8eb0 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -34,6 +34,13 @@ void Validator::add_info(Node &node, const string &message)
 }
 
 
+void DeclarationValidator::apply(Stage &s, const Features &f)
+{
+	stage = &s;
+	features = f;
+	s.content.visit(*this);
+}
+
 const char *DeclarationValidator::describe_variable(ScopeType scope)
 {
 	switch(scope)
@@ -49,6 +56,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,7 +67,9 @@ void DeclarationValidator::visit(Layout &layout)
 			allowed = (variable && scope==GLOBAL);
 		else if(q.name=="binding" || q.name=="set")
 		{
-			if(q.name=="set")
+			binding = true;
+
+			if(q.name=="set" && features.target_api!=VULKAN)
 			{
 				error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL");
 				continue;
@@ -66,11 +77,9 @@ void DeclarationValidator::visit(Layout &layout)
 
 			if(variable)
 			{
-				TypeDeclaration *type = variable->type_declaration;
-				while(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(type))
-					type = basic->base_type;
+				const TypeDeclaration *base_type = get_ultimate_base_type(variable->type_declaration);
 				bool uniform = (variable->interface=="uniform");
-				allowed = (scope==GLOBAL && uniform && dynamic_cast<ImageTypeDeclaration *>(type));
+				allowed = (scope==GLOBAL && uniform && dynamic_cast<const ImageTypeDeclaration *>(base_type));
 				err_descr = (uniform ? "variable of non-opaque type" : "non-uniform variable");
 			}
 			else if(iface_block)
@@ -141,6 +150,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 +177,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)
@@ -236,6 +254,11 @@ void DeclarationValidator::visit(VariableDeclaration &var)
 			error(var, format("Mismatched interface qualifier '%s' inside '%s' block", var.interface, iface_block->interface));
 		else if(scope==STRUCT || scope==FUNCTION)
 			error(var, format("Interface qualifier not allowed on %s", descr));
+		else if(scope==GLOBAL && variable->interface=="uniform" && features.target_api==VULKAN)
+		{
+			if(!dynamic_cast<const ImageTypeDeclaration *>(get_ultimate_base_type(variable->type_declaration)))
+				error(var, "Interface qualifier 'uniform' not allowed on non-opaque variable in global scope");
+		}
 	}
 
 	TypeDeclaration *type = var.type_declaration;
@@ -503,8 +526,7 @@ void ExpressionValidator::visit(VariableReference &var)
 			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())
+			if(has_layout_qualifier(var.declaration->layout.get(), "constant_id"))
 				error(var, format("Reference to specialization constant '%s' in a fixed constant expression", var.name));
 		}
 	}
@@ -639,13 +661,8 @@ void ExpressionValidator::visit(VariableDeclaration &var)
 		var.layout->visit(*this);
 	if(var.init_expression)
 	{
-		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;
-		}
+		ConstantKind const_kind = (!var.constant ? NOT_CONSTANT :
+			has_layout_qualifier(var.layout.get(), "constant_id") ? FIXED_CONSTANT : SPEC_CONSTANT);
 
 		SetForScope<ConstantKind> set_const(constant_expression, const_kind);
 		TraversingVisitor::visit(var.init_expression);
@@ -747,18 +764,13 @@ void FlowControlValidator::visit(Iteration &iter)
 }
 
 
-int StageInterfaceValidator::get_location(const Layout &layout)
-{
-	return get_layout_value(layout, "location", -1);
-}
-
 void StageInterfaceValidator::visit(VariableDeclaration &var)
 {
-	int location = (var.layout ? get_location(*var.layout) : -1);
+	int location = get_layout_value(var.layout.get(), "location");
 	if(var.interface=="in" && var.linked_declaration)
 	{
 		const Layout *linked_layout = var.linked_declaration->layout.get();
-		int linked_location = (linked_layout ? get_location(*linked_layout) : -1);
+		int linked_location = get_layout_value(linked_layout, "location");
 		if(linked_location!=location)
 		{
 			error(var, format("Mismatched location %d for 'in %s'", location, var.name));
@@ -887,10 +899,10 @@ void GlobalInterfaceValidator::visit(VariableDeclaration &var)
 		uni.name = var.name;
 		if(var.layout)
 		{
-			uni.location = get_layout_value(*var.layout, "location");
+			uni.location = get_layout_value(var.layout.get(), "location");
 			uni.loc_count = LocationCounter().apply(var);
-			uni.desc_set = get_layout_value(*var.layout, "set", 0);
-			uni.bind_point = get_layout_value(*var.layout, "binding");
+			uni.desc_set = get_layout_value(var.layout.get(), "set", 0);
+			uni.bind_point = get_layout_value(var.layout.get(), "binding");
 		}
 
 		uniforms.push_back(uni);
@@ -908,8 +920,8 @@ void GlobalInterfaceValidator::visit(InterfaceBlock &iface)
 		uni.name = iface.block_name;
 		if(iface.layout)
 		{
-			uni.desc_set = get_layout_value(*iface.layout, "set", 0);
-			uni.bind_point = get_layout_value(*iface.layout, "binding");
+			uni.desc_set = get_layout_value(iface.layout.get(), "set", 0);
+			uni.bind_point = get_layout_value(iface.layout.get(), "binding");
 		}
 
 		uniforms.push_back(uni);