ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linux build

Browse Source
This commit is contained in:
Vincent Lejeune
2014-07-14 18:51:01 +02:00
parent d035b86bc4
commit 160d8c1634
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/shaders.cpp
View File

@@ -474,6 +474,11 @@ void glUniform3fWraper(GLuint a, float b, float c, float d)
glUniform3f(a, b, c, d);
}
void glUniform2fWraper(GLuint a, float b, float c)
{
glUniform2f(a, b, c, d);
}
void glUniform1fWrapper(GLuint a, float b)
{
glUniform1f(a, b);

3
src/graphics/shaders.hpp
View File

@@ -50,6 +50,7 @@ public:
void glUniformMatrix4fvWraper(GLuint, size_t, unsigned, const float *mat);
void glUniform3fWraper(GLuint, float, float, float);
void glUniform2fWraper(GLuint a, float b, float c);
void glUniform1fWrapper(GLuint, float);
struct UniformHelper
@@ -87,7 +88,7 @@ struct UniformHelper
template<unsigned N = 0, typename... Args>
static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::vector2df &v, Args... arg)
{
glUniform2f(uniforms[N], v.X, v.Y);
glUniform2fWraper(uniforms[N], v.X, v.Y);
setUniformsHelper<N + 1>(uniforms, arg...);
}