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:
vlj 2014-07-13 02:33:17 +02:00
parent fd7427a1cf
commit fbcc430e0e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/shaders.cpp
View File

@ -469,6 +469,11 @@ void glUniformMatrix4fvWraper(GLuint a, size_t b, unsigned c, const float *d)
glUniformMatrix4fv(a, b, c, d); glUniformMatrix4fv(a, b, c, d);
} }
void glUniform3fWraper(GLuint a, float b, float c, float d)
{
glUniform3f(a, b, c, d);
}
namespace MeshShader namespace MeshShader
{ {

4
src/graphics/shaders.hpp
View File

@ -65,12 +65,12 @@ void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::matrix4
setUniformsHelper<N + 1>(uniforms, arg...); setUniformsHelper<N + 1>(uniforms, arg...);
} }
void glUniform3fWraper(GLuint, size_t, unsigned, const float *mat); void glUniform3fWraper(GLuint, float, float, float);
template<unsigned N = 0, typename... Args> template<unsigned N = 0, typename... Args>
void setUniformsHelper(const std::vector<GLuint> &uniforms, const video::SColorf &col, Args... arg) void setUniformsHelper(const std::vector<GLuint> &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<N + 1>(uniforms, arg...); setUniformsHelper<N + 1>(uniforms, arg...);
} }