Make register_int call register_uniform_int, now that we require GLSL 1.30.

diff --git a/effect.cpp b/effect.cpp
index 9a30b93d2dc2ac03364f03107915aa5aec143fe2..3446b42c05baab5553ae83f71c69d6ef8467774f 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -61,6 +61,7 @@ void Effect::register_int(const string &key, int *value)
 {
        assert(params_int.count(key) == 0);
        params_int[key] = value;
+       register_uniform_int(key, value);
 }
 
 void Effect::register_float(const string &key, float *value)

diff --git a/effect.h b/effect.h
index fe76a7569976b80b690a8e3c2ed87f0078ab8a2d..67e64238beb2bdc590f75ed83327b045d3e80c29 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -316,11 +316,8 @@ protected:
        //
        // Neither of these take ownership of the pointer.
 
-       // int is special since GLSL pre-1.30 doesn't have integer uniforms.
-       // Thus, ints that you register will _not_ be converted to GLSL uniforms.
+       // These correspond directly to int/float/vec2/vec3/vec4 in GLSL.
        void register_int(const std::string &key, int *value);
-
-       // These correspond directly to float/vec2/vec3/vec4 in GLSL.
        void register_float(const std::string &key, float *value);
        void register_vec2(const std::string &key, float *values);
        void register_vec3(const std::string &key, float *values);