From ea82ccd16101e8e423fa66aebd581f1963567e8a Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 8 Mar 2021 00:24:30 +0200 Subject: [PATCH] Apply replacement to variable declaration components in VariableResolver This got missed on cb8ee1f. --- source/glsl/generate.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp index 4e225ae5..4fd8c6ab 100644 --- a/source/glsl/generate.cpp +++ b/source/glsl/generate.cpp @@ -398,7 +398,12 @@ void VariableResolver::visit(VariableDeclaration &var) if(!block_interface.empty() && var.interface.empty()) var.interface = block_interface; - TraversingVisitor::visit(var); + if(var.layout) + var.layout->visit(*this); + if(var.array_size) + visit_and_replace(var.array_size); + if(var.init_expression) + visit_and_replace(var.init_expression); current_block->variables.insert(make_pair(var.name, &var)); } -- 2.43.0