From fbcc430e0e432564cb371d88a212baa60a2a467c Mon Sep 17 00:00:00 2001 From: vlj Date: Sun, 13 Jul 2014 02:33:17 +0200 Subject: [PATCH] Fix linux build. --- src/graphics/shaders.cpp | 5 +++++ src/graphics/shaders.hpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp index fe3a77b74..9a68097f4 100644 --- a/src/graphics/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -469,6 +469,11 @@ void glUniformMatrix4fvWraper(GLuint a, size_t b, unsigned c, const float *d) glUniformMatrix4fv(a, b, c, d); } +void glUniform3fWraper(GLuint a, float b, float c, float d) +{ + glUniform3f(a, b, c, d); +} + namespace MeshShader { diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp index 687fc8226..f0bc6ff82 100644 --- a/src/graphics/shaders.hpp +++ b/src/graphics/shaders.hpp @@ -65,12 +65,12 @@ void setUniformsHelper(const std::vector &uniforms, const core::matrix4 setUniformsHelper(uniforms, arg...); } -void glUniform3fWraper(GLuint, size_t, unsigned, const float *mat); +void glUniform3fWraper(GLuint, float, float, float); template void setUniformsHelper(const std::vector &uniforms, const video::SColorf &col, Args... arg) { - glUniform3f(uniforms[N], col.r, col.g, col.b); + glUniform3fWraper(uniforms[N], col.r, col.g, col.b); setUniformsHelper(uniforms, arg...); }