Remove dead function set_uniform_float_array().

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index d0222dec91f936e662d5c82adb1c05ccf0eb4110..1847f4831f4792b73edc62fcf6f4df07c60406c3 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -35,47 +35,54 @@ void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const
        check_error();
 }
 
-void set_uniform_float_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
 {
        GLint location = get_uniform_location(glsl_program_num, prefix, key);
        if (location == -1) {
                return;
        }
        check_error();
-       glUniform1fv(location, num_values, values);
+       glUniform2fv(location, 1, values);
        check_error();
 }
 
-void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
 {
        GLint location = get_uniform_location(glsl_program_num, prefix, key);
        if (location == -1) {
                return;
        }
        check_error();
-       glUniform2fv(location, 1, values);
+       glUniform3fv(location, 1, values);
        check_error();
 }
 
-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
 {
        GLint location = get_uniform_location(glsl_program_num, prefix, key);
        if (location == -1) {
                return;
        }
        check_error();
-       glUniform3fv(location, 1, values);
+       glUniform4fv(location, num_values, values);
        check_error();
 }
 
-void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Matrix3x3 matrix)
 {
        GLint location = get_uniform_location(glsl_program_num, prefix, key);
        if (location == -1) {
                return;
        }
        check_error();
-       glUniform4fv(location, num_values, values);
+
+       // Convert to float (GLSL has no double matrices).
+       float matrixf[9];
+       for (unsigned i = 0; i < 9; ++i) {
+               matrixf[i] = matrix[i];
+       }
+
+       glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
        check_error();
 }