From: Steinar H. Gunderson Date: Mon, 1 Oct 2012 18:37:19 +0000 (+0200) Subject: The return value from glGetUniformLocation() is of course signed. X-Git-Tag: 1.0~459 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=f428e5f85aeda850d43c4b134fbb286b574c63fb;hp=19a5a44c107dbba0e784ffb7ffcbcd8dd8e91119 The return value from glGetUniformLocation() is of course signed. --- diff --git a/effect.cpp b/effect.cpp index c17ad3f..cab91bf 100644 --- a/effect.cpp +++ b/effect.cpp @@ -12,7 +12,7 @@ void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value) { std::string name = prefix + "_" + key; - GLuint l = glGetUniformLocation(glsl_program_num, name.c_str()); + GLint l = glGetUniformLocation(glsl_program_num, name.c_str()); if (l == -1) { return; } @@ -24,7 +24,7 @@ void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values) { std::string name = prefix + "_" + key; - GLuint l = glGetUniformLocation(glsl_program_num, name.c_str()); + GLint l = glGetUniformLocation(glsl_program_num, name.c_str()); if (l == -1) { return; }