From a0ced951a3ad27223d71caae71eeeb5c62c6ce77 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 3 Oct 2012 14:55:27 +0200 Subject: [PATCH 1/1] Support setting vec4 arrays. --- effect.cpp | 12 ++++++++++++ effect.h | 1 + 2 files changed, 13 insertions(+) diff --git a/effect.cpp b/effect.cpp index 4cc1775..8cba87b 100644 --- a/effect.cpp +++ b/effect.cpp @@ -69,6 +69,18 @@ void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const 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) +{ + std::string name = prefix + "_" + key; + GLint l = glGetUniformLocation(glsl_program_num, name.c_str()); + if (l == -1) { + return; + } + check_error(); + glUniform4fv(l, num_values, values); + check_error(); +} + bool Effect::set_int(const std::string &key, int value) { if (params_int.count(key) == 0) { diff --git a/effect.h b/effect.h index 2f0172a..b545f85 100644 --- a/effect.h +++ b/effect.h @@ -28,6 +28,7 @@ void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const 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); 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); class Effect { public: -- 2.39.2