Move unique name generation to syntax.cpp

[libs/gl.git] / source / glsl / optimize.cpp

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 220017971a2f75001cb6e30faeb4a4fecc2b9fa9..c8c9041fd43c7c9814cbd53e4d3ab8a719252cb2 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -91,20 +91,6 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
        return r_result_name;
 }
 
-string InlineContentInjector::create_unused_name(const string &base, bool always_prefix)
-{
-       string result = base;
-       if(always_prefix || target_block->variables.count(result))
-               result = format("_%s_%s", source_func->name, base);
-       unsigned initial_size = result.size();
-       for(unsigned i=1; target_block->variables.count(result); ++i)
-       {
-               result.erase(initial_size);
-               result += format("_%d", i);
-       }
-       return result;
-}
-
 void InlineContentInjector::visit(VariableReference &var)
 {
        if(remap_names)
@@ -152,7 +138,7 @@ void InlineContentInjector::visit(VariableDeclaration &var)
        if(!remap_names && !deps_only)
        {
                RefPtr<VariableDeclaration> inlined_var = var.clone();
-               inlined_var->name = create_unused_name(var.name, false);
+               inlined_var->name = get_unused_variable_name(*target_block, var.name, source_func->name);
                r_inlined_statement = inlined_var;
 
                variable_map[var.name] = inlined_var.get();
@@ -167,7 +153,7 @@ void InlineContentInjector::visit(Return &ret)
        {
                /* Create a new variable to hold the return value of the inlined
                function. */
-               r_result_name = create_unused_name("return", true);
+               r_result_name = get_unused_variable_name(*target_block, "_return", source_func->name);
                RefPtr<VariableDeclaration> var = new VariableDeclaration;
                var->source = ret.source;
                var->line = ret.line;