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

Try to fix linux compilation.

Browse Source
This commit is contained in:
hiker 2014-07-15 16:09:57 +10:00
parent a3dbb53540
commit 3684d22ef8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/render_geometry.cpp
View File

@ -61,7 +61,7 @@ void apply_instance(const T *Shader, const std::tuple<TupleType...> &arg)
template<typename Shader, enum E_VERTEX_TYPE VertexType, typename... TupleType> template<typename Shader, enum E_VERTEX_TYPE VertexType, typename... TupleType>
void renderMeshes1stPass(const std::vector<GLuint> &TexUnits, std::vector<std::tuple<TupleType...> > &meshes) void renderMeshes1stPass(const std::vector<GLuint> &TexUnits, std::vector<std::tuple<TupleType...> > &meshes)
{ {
glUseProgram(Shader::getInstance<Shader>()->Program); glUseProgram(Shader::getInstance()->Program);
glBindVertexArray(getVAO(VertexType)); glBindVertexArray(getVAO(VertexType));
for (unsigned i = 0; i < meshes.size(); i++) for (unsigned i = 0; i < meshes.size(); i++)
{ {
@ -80,7 +80,7 @@ void renderMeshes1stPass(const std::vector<GLuint> &TexUnits, std::vector<std::t
#endif #endif
continue; continue;
} }
apply_instance(Shader::getInstance<Shader>(), meshes[i]); apply_instance(Shader::getInstance(), meshes[i]);
} }
} }