#include <cstring>
#include <msp/core/hash.h>
#include <msp/core/maputils.h>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
#include <msp/strings/format.h>
-#include "arb_shader_objects.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_shader.h"
#include "buffer.h"
#include "error.h"
#include "program.h"
if(!(linked = value))
throw compile_error(get_info_log());
- glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &value);
- unsigned count = value;
+ int count;
+ glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &count);
vector<UniformInfo *> uniforms_by_index(count);
- for(unsigned i=0; i<count; ++i)
+ for(int i=0; i<count; ++i)
{
char name[128];
int len = 0;
if(ARB_uniform_buffer_object)
{
- glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &value);
- count = value;
- for(unsigned i=0; i<count; ++i)
+ glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &count);
+ for(int i=0; i<count; ++i)
{
char name[128];
int len;