From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 27 Nov 2021 10:58:18 +0000 (+0200)
Subject: Use correct variable to access values
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=fea5f2abec9b8e971d8467804f379cfcd81e9ff7

Use correct variable to access values
---

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index e9a8bb3b..1d0192fe 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -254,9 +254,9 @@ 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)
+		else if(scope==GLOBAL && var.interface=="uniform" && !var.block_declaration && features.target_api==VULKAN)
 		{
-			if(!dynamic_cast<const ImageTypeDeclaration *>(get_ultimate_base_type(variable->type_declaration)))
+			if(!dynamic_cast<const ImageTypeDeclaration *>(get_ultimate_base_type(var.type_declaration)))
 				error(var, "Interface qualifier 'uniform' not allowed on non-opaque variable in global scope");
 		}
 	}