From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 8 Nov 2021 21:10:34 +0000 (+0200)
Subject: Always apply feature conversion in the GLSL compiler
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ac4218f733b4c8f09b64e72164bd4321a4c1abd2;p=libs%2Fgl.git

Always apply feature conversion in the GLSL compiler

Also convert structural features before allocating locations.  This
gives flattened push constant uniforms locations too.
---

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 3f259350..00efbd94 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -101,6 +101,11 @@ void Compiler::compile(Mode mode)
 			++i;
 	}
 
+	for(Stage &s: module->stages)
+	{
+		StructuralFeatureConverter().apply(s, features);
+		resolve(s, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+	}
 	LocationAllocator().apply(*module, features);
 	for(Stage &s: module->stages)
 		finalize(s, mode);
@@ -389,14 +394,9 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 void Compiler::finalize(Stage &stage, Mode mode)
 {
-	if(mode==PROGRAM)
-	{
-		StructuralFeatureConverter().apply(stage, features);
-		QualifierConverter().apply(stage, features);
-		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
-		PrecisionConverter().apply(stage);
-	}
-	else if(mode==SPIRV)
+	QualifierConverter().apply(stage, features);
+	PrecisionConverter().apply(stage);
+	if(mode==SPIRV)
 		StructOrganizer().apply(stage);
 
 	// Collect bindings from all stages into the shared stage's maps