X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;fp=source%2Fglsl%2Fsyntax.cpp;h=e7a3990e5c1478b3fcdf8e5727226b05ba688582;hp=c94e2e27042c63a6a7f0b2c91f3d26c5b00f1e30;hb=22d5405729048ee2677a1e45e309e6328de64a26;hpb=6142f469eb17c06a432fde663c36a0567985d986

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index c94e2e27..e7a3990e 100644
--- 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;
 	}
 }