#include <msp/gl/extensions/arb_uniform_buffer_object.h>
#include <msp/gl/extensions/arb_vertex_shader.h>
#include <msp/gl/extensions/ext_gpu_shader4.h>
+#include <msp/gl/extensions/nv_non_square_matrices.h>
#include <msp/strings/format.h>
#include "buffer.h"
#include "error.h"
int Program::get_uniform_location(const string &n) const
{
+ if(n[n.size()-1]==']')
+ throw invalid_argument("Program::get_uniform_location");
+
UniformMap::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. */
- unsigned offset = lexical_cast<unsigned>(n.substr(open_bracket+1, n.size()-2-open_bracket));
- i = uniforms.find(n.substr(0, open_bracket));
- if(i!=uniforms.end() && i->second.block->bind_point<0 && offset<i->second.size)
- return i->second.location+offset;
- }
- }
return -1;
- }
return i->second.block->bind_point<0 ? i->second.location : -1;
}