From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 12 Aug 2012 09:07:38 +0000 (+0300)
Subject: Fix uniform array element lookup
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ec0f55e58e978ce780c81629c39f2f5e474072c6;p=libs%2Fgl.git

Fix uniform array element lookup
---

diff --git a/source/program.cpp b/source/program.cpp
index 9e54d6a8..749a7d9c 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -259,7 +259,23 @@ int Program::get_uniform_location(const string &n) const
 {
 	map<string, UniformInfo>::const_iterator i = uniforms.find(n);
 	if(i==uniforms.end())
+	{
+		if(n[n.size()-1]==']')
+		{
+			string::size_type open_bracket = n.rfind('[');
+			if(open_bracket!=string::npos)
+			{
+				/* The requested name looks like an array.  glGetActiveUniform only
+				gives us the first element of the array, so try to look that up and
+				add an offset. */
+				int offset = lexical_cast<unsigned>(n.substr(open_bracket+1, n.size()-2-open_bracket));
+				i = uniforms.find(n.substr(0, open_bracket)+"[0]");
+				if(i!=uniforms.end() && offset<i->second.size)
+					return i->second.location+offset;
+			}
+		}
 		return -1;
+	}
 
 	return i->second.location;
 }