Adjust naming of generated variables

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

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index c94e2e27042c63a6a7f0b2c91f3d26c5b00f1e30..e7a3990e5c1478b3fcdf8e5727226b05ba688582 100644 (file)
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -465,13 +465,12 @@ Module::Module():
 { }
 
 
-string get_unused_variable_name(const Block &block, const string &base, const string &prefix_hint)
+string get_unused_variable_name(const Block &block, const string &base)
 {
        string name = base;
 
-       bool prefixed = false;
        unsigned number = 1;
-       unsigned size_without_number = name.size();
+       unsigned base_size = name.size();
        while(1)
        {
                bool unused = true;
@@ -480,22 +479,9 @@ string get_unused_variable_name(const Block &block, const string &base, const st
                if(unused)
                        return name;
 
-               if(!prefixed && !prefix_hint.empty())
-               {
-                       if(name.front()!='_')
-                               name = "_"+name;
-                       name = prefix_hint+name;
-                       if(name.front()!='_')
-                               name = "_"+name;
-                       prefixed = true;
-                       size_without_number = name.size();
-               }
-               else
-               {
-                       name.erase(size_without_number);
-                       name += format("_%d", number);
-                       ++number;
-               }
+               name.erase(base_size);
+               name += format("_%d", number);
+               ++number;
        }
 }