mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Added some missing win32 GL function support needed for GL3

Browse source
This commit is contained in:
jules 2016-01-29 15:12:05 +00:00
parent bb1b362162
commit 4e6ea1dbdf
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/juce_opengl/native/juce_OpenGLExtensions.h
View file

@ -73,6 +73,9 @@
USE_FUNCTION (glVertexAttribPointer, void, (GLuint p1, GLint p2, GLenum p3, GLboolean p4, GLsizei p5, const GLvoid* p6), (p1, p2, p3, p4, p5, p6))\
USE_FUNCTION (glEnableVertexAttribArray, void, (GLuint p1), (p1))\
USE_FUNCTION (glDisableVertexAttribArray, void, (GLuint p1), (p1))\
USE_FUNCTION (glGenVertexArrays, void, (GLsizei p1, GLuint* p2), (p1, p2))\
USE_FUNCTION (glDeleteVertexArrays, void, (GLsizei p1, const GLuint* p2), (p1, p2))\
USE_FUNCTION (glBindVertexArray, void, (GLuint p1), (p1))\
USE_FUNCTION (glUniform1f, void, (GLint p1, GLfloat p2), (p1, p2))\
USE_FUNCTION (glUniform1i, void, (GLint p1, GLint p2), (p1, p2))\
USE_FUNCTION (glUniform2f, void, (GLint p1, GLfloat p2, GLfloat p3), (p1, p2, p3))\

6
modules/juce_opengl/opengl/juce_OpenGLContext.cpp
View file

@ -279,7 +279,7 @@ public:
{
#if JUCE_OPENGL3
if (vertexArrayObject != 0)
glBindVertexArray (vertexArrayObject);
context.extensions.glBindVertexArray (vertexArrayObject);
#endif
}
@ -457,7 +457,7 @@ public:
#if JUCE_OPENGL3
if (OpenGLShaderProgram::getLanguageVersion() > 1.2)
{
glGenVertexArrays (1, &vertexArrayObject);
context.extensions.glGenVertexArrays (1, &vertexArrayObject);
bindVertexArray();
}
#endif
@ -484,7 +484,7 @@ public:
#if JUCE_OPENGL3
if (vertexArrayObject != 0)
glDeleteVertexArrays (1, &vertexArrayObject);
context.extensions.glDeleteVertexArrays (1, &vertexArrayObject);
#endif
associatedObjectNames.clear();