From 4e6ea1dbdfb67c91bd9614b3c80fdeb7ecedecc1 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 29 Jan 2016 15:12:05 +0000 Subject: [PATCH] Added some missing win32 GL function support needed for GL3 --- modules/juce_opengl/native/juce_OpenGLExtensions.h | 3 +++ modules/juce_opengl/opengl/juce_OpenGLContext.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/juce_opengl/native/juce_OpenGLExtensions.h b/modules/juce_opengl/native/juce_OpenGLExtensions.h index daa3d61947..d74dfd2242 100644 --- a/modules/juce_opengl/native/juce_OpenGLExtensions.h +++ b/modules/juce_opengl/native/juce_OpenGLExtensions.h @@ -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))\ diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp index b67965f02e..a3e6383db9 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp @@ -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();