OpenGL fixes to support OSX10.5 and older win32 systems.

modules/juce_opengl/juce_opengl.cpp

@@ -112,6 +112,10 @@
  #undef SIZEOF
  #undef KeyPress
 
+//==============================================================================
+#elif JUCE_MAC
+ #include <OpenGL/CGLCurrent.h>
+
 //==============================================================================
 #elif JUCE_ANDROID
  #ifndef GL_GLEXT_PROTOTYPES
@@ -132,9 +136,14 @@ void OpenGLExtensionFunctions::initialise()
    #if JUCE_WINDOWS || JUCE_LINUX
     #define JUCE_INIT_GL_FUNCTION(name, returnType, params, callparams) \
         name = (type_ ## name) OpenGLHelpers::getExtensionFunction (#name);
+    #define JUCE_INIT_GL_FUNCTION_EXT(name, returnType, params, callparams) \
+        name = (type_ ## name) OpenGLHelpers::getExtensionFunction (#name); \
+        if (name == nullptr) \
+            name = (type_ ## name) OpenGLHelpers::getExtensionFunction (JUCE_STRINGIFY (name ## EXT));
 
-    JUCE_GL_EXTENSION_FUNCTIONS (JUCE_INIT_GL_FUNCTION)
+    JUCE_GL_EXTENSION_FUNCTIONS (JUCE_INIT_GL_FUNCTION, JUCE_INIT_GL_FUNCTION_EXT)
     #undef JUCE_INIT_GL_FUNCTION
+    #undef JUCE_INIT_GL_FUNCTION_EXT
    #endif
 }
 
@@ -142,7 +151,7 @@ void OpenGLExtensionFunctions::initialise()
  #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams) \
     inline returnType OpenGLExtensionFunctions::name params { return ::name callparams; }
 
- JUCE_GL_EXTENSION_FUNCTIONS (JUCE_DECLARE_GL_FUNCTION)
+ JUCE_GL_EXTENSION_FUNCTIONS (JUCE_DECLARE_GL_FUNCTION, JUCE_DECLARE_GL_FUNCTION)
  #undef JUCE_DECLARE_GL_FUNCTION
 #endif
 

modules/juce_opengl/native/juce_MissingGLDefinitions.h

@@ -107,15 +107,7 @@ namespace
         GL_SHADING_LANGUAGE_VERSION     = 0x8B8C,
         GL_FRAGMENT_SHADER              = 0x8B30,
         GL_VERTEX_SHADER                = 0x8B31,
-        GL_FRAMEBUFFER                  = 0x8D40,
-        GL_RENDERBUFFER                 = 0x8D41,
-        GL_FRAMEBUFFER_BINDING          = 0x8CA6,
-        GL_COLOR_ATTACHMENT0            = 0x8CE0,
-        GL_DEPTH_ATTACHMENT             = 0x8D00,
-        GL_STENCIL_ATTACHMENT           = 0x8D20,
-        GL_FRAMEBUFFER_COMPLETE         = 0x8CD5,
         GL_DEPTH24_STENCIL8             = 0x88F0,
-        GL_RENDERBUFFER_DEPTH_SIZE      = 0x8D54,
         GL_ARRAY_BUFFER                 = 0x8892,
         GL_ELEMENT_ARRAY_BUFFER         = 0x8893,
         GL_STATIC_DRAW                  = 0x88E4,
@@ -126,4 +118,36 @@ namespace
     typedef pointer_sized_int GLsizeiptr;
     typedef pointer_sized_int GLintptr;
    #endif
+
+   #ifndef GL_COLOR_ATTACHMENT0
+    #define GL_COLOR_ATTACHMENT0        0x8CE0
+   #endif
+
+   #ifndef GL_DEPTH_ATTACHMENT
+    #define GL_DEPTH_ATTACHMENT         0x8D00
+   #endif
+
+   #ifndef GL_FRAMEBUFFER
+    #define GL_FRAMEBUFFER              0x8D40
+   #endif
+
+   #ifndef GL_FRAMEBUFFER_BINDING
+    #define GL_FRAMEBUFFER_BINDING      0x8CA6
+   #endif
+
+   #ifndef GL_FRAMEBUFFER_COMPLETE
+    #define GL_FRAMEBUFFER_COMPLETE     0x8CD5
+   #endif
+
+   #ifndef GL_RENDERBUFFER
+    #define GL_RENDERBUFFER             0x8D41
+   #endif
+
+   #ifndef GL_RENDERBUFFER_DEPTH_SIZE
+    #define GL_RENDERBUFFER_DEPTH_SIZE  0x8D54
+   #endif
+
+   #ifndef GL_STENCIL_ATTACHMENT
+    #define GL_STENCIL_ATTACHMENT       0x8D20
+   #endif
 }

modules/juce_opengl/native/juce_OpenGLExtensions.h

@@ -26,34 +26,40 @@
 #ifndef __JUCE_OPENGLEXTENSIONS_JUCEHEADER__
 #define __JUCE_OPENGLEXTENSIONS_JUCEHEADER__
 
+#if JUCE_MAC && (JUCE_PPC || ((! defined (MAC_OS_X_VERSION_10_6)) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6))
+ #define JUCE_EXT(func) func ## EXT
+#else
+ #define JUCE_EXT(func) func
+#endif
 
 /** @internal This macro contains a list of GL extension functions that need to be dynamically loaded on Windows/Linux.
     @see OpenGLExtensionFunctions
 */
-#define JUCE_GL_BASIC_EXTENSION_FUNCTIONS(USE_FUNCTION) \
+#define JUCE_GL_BASIC_EXTENSION_FUNCTIONS(USE_FUNCTION, EXT_FUNCTION) \
     USE_FUNCTION (glActiveTexture,          void, (GLenum p1), (p1))\
     USE_FUNCTION (glBindBuffer,             void, (GLenum p1, GLuint p2), (p1, p2))\
     USE_FUNCTION (glDeleteBuffers,          void, (GLsizei p1, const GLuint* p2), (p1, p2))\
     USE_FUNCTION (glGenBuffers,             void, (GLsizei p1, GLuint* p2), (p1, p2))\
     USE_FUNCTION (glBufferData,             void, (GLenum p1, GLsizeiptr p2, const GLvoid* p3, GLenum p4), (p1, p2, p3, p4))\
     USE_FUNCTION (glBufferSubData,          void, (GLenum p1, GLintptr p2, GLsizeiptr p3, const GLvoid* p4), (p1, p2, p3, p4))\
-    USE_FUNCTION (glIsRenderbuffer,         GLboolean, (GLuint p1), (p1))\
-    USE_FUNCTION (glBindRenderbuffer,       void, (GLenum p1, GLuint p2), (p1, p2))\
-    USE_FUNCTION (glDeleteRenderbuffers,    void, (GLsizei p1, const GLuint* p2), (p1, p2))\
-    USE_FUNCTION (glGenRenderbuffers,       void, (GLsizei p1, GLuint* p2), (p1, p2))\
-    USE_FUNCTION (glRenderbufferStorage,    void, (GLenum p1, GLenum p2, GLsizei p3, GLsizei p4), (p1, p2, p3, p4))\
-    USE_FUNCTION (glGetRenderbufferParameteriv,  void, (GLenum p1, GLenum p2, GLint* p3), (p1, p2, p3))\
-    USE_FUNCTION (glIsFramebuffer,          GLboolean, (GLuint p1), (p1))\
-    USE_FUNCTION (glBindFramebuffer,        void, (GLenum p1, GLuint p2), (p1, p2))\
-    USE_FUNCTION (glDeleteFramebuffers,     void, (GLsizei p1, const GLuint* p2), (p1, p2))\
-    USE_FUNCTION (glGenFramebuffers,        void, (GLsizei p1, GLuint* p2), (p1, p2))\
-    USE_FUNCTION (glCheckFramebufferStatus, GLenum, (GLenum p1), (p1))\
-    USE_FUNCTION (glFramebufferTexture2D,   void, (GLenum p1, GLenum p2, GLenum p3, GLuint p4, GLint p5), (p1, p2, p3, p4, p5))\
-    USE_FUNCTION (glFramebufferRenderbuffer,  void, (GLenum p1, GLenum p2, GLenum p3, GLuint p4), (p1, p2, p3, p4))\
-    USE_FUNCTION (glGetFramebufferAttachmentParameteriv, void, (GLenum p1, GLenum p2, GLenum p3, GLint* p4), (p1, p2, p3, p4))
+    EXT_FUNCTION (glIsRenderbuffer,         GLboolean, (GLuint p1), (p1))\
+    EXT_FUNCTION (glBindRenderbuffer,       void, (GLenum p1, GLuint p2), (p1, p2))\
+    EXT_FUNCTION (glDeleteRenderbuffers,    void, (GLsizei p1, const GLuint* p2), (p1, p2))\
+    EXT_FUNCTION (glGenRenderbuffers,       void, (GLsizei p1, GLuint* p2), (p1, p2))\
+    EXT_FUNCTION (glRenderbufferStorage,    void, (GLenum p1, GLenum p2, GLsizei p3, GLsizei p4), (p1, p2, p3, p4))\
+    EXT_FUNCTION (glGetRenderbufferParameteriv,  void, (GLenum p1, GLenum p2, GLint* p3), (p1, p2, p3))\
+    EXT_FUNCTION (glIsFramebuffer,          GLboolean, (GLuint p1), (p1))\
+    EXT_FUNCTION (glBindFramebuffer,        void, (GLenum p1, GLuint p2), (p1, p2))\
+    EXT_FUNCTION (glDeleteFramebuffers,     void, (GLsizei p1, const GLuint* p2), (p1, p2))\
+    EXT_FUNCTION (glGenFramebuffers,        void, (GLsizei p1, GLuint* p2), (p1, p2))\
+    EXT_FUNCTION (glCheckFramebufferStatus, GLenum, (GLenum p1), (p1))\
+    EXT_FUNCTION (glFramebufferTexture2D,   void, (GLenum p1, GLenum p2, GLenum p3, GLuint p4, GLint p5), (p1, p2, p3, p4, p5))\
+    EXT_FUNCTION (glFramebufferRenderbuffer,  void, (GLenum p1, GLenum p2, GLenum p3, GLuint p4), (p1, p2, p3, p4))\
+    EXT_FUNCTION (glGetFramebufferAttachmentParameteriv, void, (GLenum p1, GLenum p2, GLenum p3, GLint* p4), (p1, p2, p3, p4))
 
 #if JUCE_USE_OPENGL_SHADERS
- #define JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION) JUCE_GL_BASIC_EXTENSION_FUNCTIONS(USE_FUNCTION) \
+ #define JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION, EXT_FUNCTION) \
+    JUCE_GL_BASIC_EXTENSION_FUNCTIONS(USE_FUNCTION, EXT_FUNCTION) \
     USE_FUNCTION (glCreateProgram,          GLuint, (), ())\
     USE_FUNCTION (glDeleteProgram,          void, (GLuint p1), (p1))\
     USE_FUNCTION (glCreateShader,           GLuint, (GLenum p1), (p1))\
@@ -80,14 +86,14 @@
     USE_FUNCTION (glUniform4i,              void, (GLint p1, GLint p2, GLint p3, GLint p4, GLint p5), (p1, p2, p3, p4, p5))\
     USE_FUNCTION (glUniform1fv,             void, (GLint p1, GLsizei p2, const GLfloat* p3), (p1, p2, p3))
 #else
- #define JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION) JUCE_GL_BASIC_EXTENSION_FUNCTIONS(USE_FUNCTION)
+ #define JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION) JUCE_GL_BASIC_EXTENSION_FUNCTIONS(USE_FUNCTION, EXT_FUNCTION)
 #endif
 
 #if JUCE_USE_OPENGL_FIXED_FUNCTION
- #define JUCE_GL_EXTENSION_FUNCTIONS(USE_FUNCTION) JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION) \
+ #define JUCE_GL_EXTENSION_FUNCTIONS(USE_FUNCTION, EXT_FUNCTION) JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION, EXT_FUNCTION) \
     USE_FUNCTION (glClientActiveTexture,    void, (GLenum p1), (p1))
 #else
- #define JUCE_GL_EXTENSION_FUNCTIONS(USE_FUNCTION) JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION)
+ #define JUCE_GL_EXTENSION_FUNCTIONS(USE_FUNCTION, EXT_FUNCTION) JUCE_GL_EXTENSION_FUNCTIONS1(USE_FUNCTION, EXT_FUNCTION)
 #endif
 
 /** This class contains a generated list of OpenGL extension functions, which are either dynamically loaded
@@ -110,14 +116,18 @@ struct OpenGLExtensionFunctions
      #define JUCE_GL_STDCALL
     #endif
 
-    #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams) typedef returnType (JUCE_GL_STDCALL *type_ ## name) params; type_ ## name name;
+    #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams)      typedef returnType (JUCE_GL_STDCALL *type_ ## name) params; type_ ## name name;
+    JUCE_GL_EXTENSION_FUNCTIONS (JUCE_DECLARE_GL_FUNCTION, JUCE_DECLARE_GL_FUNCTION)
    #elif JUCE_OPENGL_ES
-    #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams) inline static returnType name params;
+    #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams)      inline static returnType name params;
+    JUCE_GL_EXTENSION_FUNCTIONS (JUCE_DECLARE_GL_FUNCTION, JUCE_DECLARE_GL_FUNCTION)
    #else
-    #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams) inline static returnType name params { return ::name callparams; }
+    #define JUCE_DECLARE_GL_FUNCTION(name, returnType, params, callparams)      inline static returnType name params { return ::name callparams; }
+    #define JUCE_DECLARE_GL_FUNCTION_EXT(name, returnType, params, callparams)  inline static returnType name params { return ::name ## EXT callparams; }
+    JUCE_GL_EXTENSION_FUNCTIONS (JUCE_DECLARE_GL_FUNCTION, JUCE_DECLARE_GL_FUNCTION_EXT)
+    #undef JUCE_DECLARE_GL_FUNCTION_EXT
    #endif
 
-    JUCE_GL_EXTENSION_FUNCTIONS (JUCE_DECLARE_GL_FUNCTION)
     #undef JUCE_DECLARE_GL_FUNCTION
 };