Merge pull request #2053 from tobbi/fix_redefinition_warning

Fix glVertexAttribDivisor redefinition warning
2015-04-01 19:07:34 -04:00 · 2015-04-01 19:07:34 -04:00 · 6af71fe582
commit 6af71fe582
parent d8a918758d cedb7e7123
1 changed files with 3 additions and 0 deletions
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@ -30,6 +30,9 @@ extern "C" {
 #    include <OpenGL/gl3.h>
 #    define OGL32CTX
 #    ifdef GL_ARB_instanced_arrays
+#        ifdef glVertexAttribDivisor
+#            undef glVertexAttribDivisor
+#        endif
 #        define glVertexAttribDivisor glVertexAttribDivisorARB
 #    endif
 #    ifndef GL_TEXTURE_SWIZZLE_RGBA