From 30f676460bb6e87fd7ca2532e507b97965c4a407 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 9 Mar 2021 19:27:58 +0200
Subject: [PATCH] Rename and rearrange a few things

---
 source/glsl/debug.cpp    | 26 +++++++++++++-------------
 source/glsl/generate.cpp |  6 +++---
 source/glsl/optimize.cpp | 18 +++++++++---------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index dd9db2f8..68615ed6 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -366,28 +366,28 @@ void DumpTree::visit(VariableDeclaration &var)
 	append_subtree(branches);
 }
 
-void DumpTree::visit(InterfaceBlock &block)
+void DumpTree::visit(InterfaceBlock &iface)
 {
 	string head;
-	if(!block.instance_name.empty())
-		head += format("%%%d ", get_label(block));
-	head += format("%s %s", block.interface, block.name);
-	if(!block.instance_name.empty())
-		head += format(" %s", block.instance_name);
-	if(block.array)
+	if(!iface.instance_name.empty())
+		head += format("%%%d ", get_label(iface));
+	head += format("%s %s", iface.interface, iface.name);
+	if(!iface.instance_name.empty())
+		head += format(" %s", iface.instance_name);
+	if(iface.array)
 		head += "[]";
-	if(block.source==BUILTIN_SOURCE)
+	if(iface.source==BUILTIN_SOURCE)
 		head += " (builtin)";
-	else if(block.linked_block)
+	else if(iface.linked_block)
 		head += " (linked)";
 	append(head);
 
 	begin_sub();
 	last_branch();
-	if(block.type_declaration)
-		append(format("Type: %%%d %s", get_label(*block.type_declaration), block.type_declaration->name));
-	else if(block.members)
-		block.members->visit(*this);
+	if(iface.type_declaration)
+		append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
+	else if(iface.members)
+		iface.members->visit(*this);
 	end_sub();
 }
 
diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 29d52364..09a776af 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -591,11 +591,11 @@ void ExpressionResolver::convert_to(RefPtr<Expression> &expr, BasicTypeDeclarati
 
 bool ExpressionResolver::convert_to_element(RefPtr<Expression> &expr, BasicTypeDeclaration &elem_type)
 {
-	if(BasicTypeDeclaration *expr_type = dynamic_cast<BasicTypeDeclaration *>(expr->type))
+	if(BasicTypeDeclaration *expr_basic = dynamic_cast<BasicTypeDeclaration *>(expr->type))
 	{
 		BasicTypeDeclaration *to_type = &elem_type;
-		if(is_vector_or_matrix(*expr_type))
-			to_type = find_type(elem_type, expr_type->kind, expr_type->size);
+		if(is_vector_or_matrix(*expr_basic))
+			to_type = find_type(elem_type, expr_basic->kind, expr_basic->size);
 		if(to_type)
 		{
 			convert_to(expr, *to_type);
diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index be6cf7b6..7f60e67c 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -558,15 +558,6 @@ void ConstantConditionEliminator::visit(Iteration &iter)
 }
 
 
-UnusedVariableRemover::VariableInfo::VariableInfo():
-	local(false),
-	output(false),
-	conditionally_assigned(false),
-	referenced(false),
-	interface_block(0)
-{ }
-
-
 bool UnusedTypeRemover::apply(Stage &stage)
 {
 	stage.content.visit(*this);
@@ -634,6 +625,15 @@ void UnusedTypeRemover::visit(FunctionDeclaration &func)
 }
 
 
+UnusedVariableRemover::VariableInfo::VariableInfo():
+	local(false),
+	output(false),
+	conditionally_assigned(false),
+	referenced(false),
+	interface_block(0)
+{ }
+
+
 UnusedVariableRemover::UnusedVariableRemover():
 	stage(0),
 	interface_block(0),
-- 
2.45.2