From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 4 Dec 2021 00:12:14 +0000 (+0200)
Subject: Avoid collisions with members of nameless interface blocks when inlining
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=5be19592e0c75ea8f9b7e5abb31b4fabd907d9ef;p=libs%2Fgl.git

Avoid collisions with members of nameless interface blocks when inlining
---

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 1b9b41de..6e4b5677 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -115,12 +115,16 @@ string InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_fu
 
 	/* Populate referenced_names from the target function so we can rename
 	variables from the inlined function that would conflict.  Only consider
-	names which declared in blocks linearly related to the target block. */
+	names declared in blocks linearly related to the target block. */
 	pass = REFERENCED;
 	tgt_blk.visit(*this);
 	for(const Block *b=&tgt_blk; b; b=b->parent)
 		for(const auto &kvp: b->variables)
 			referenced_names.insert(kvp.first);
+	for(const auto &kvp: stage.interface_blocks)
+		if(kvp.second->name.find(' ')!=string::npos)
+			for(const auto &kvp2: kvp.second->block_declaration->members.variables)
+				referenced_names.insert(kvp2.first);
 
 	/* Inline and rename passes must be interleaved so used variable names are
 	known when inlining the return statement. */