3 files changed, 85 insertions, 4 deletions

diff --git a/make/stub_includes/macosx/OpenGL/OpenGL.h b/make/stub_includes/macosx/OpenGL/OpenGL.h
index 16225b46b..afb11efea 100644
--- a/make/stub_includes/macosx/OpenGL/OpenGL.h
+++ b/make/stub_includes/macosx/OpenGL/OpenGL.h
@@ -73,18 +73,44 @@ typedef enum _CGLError {
 	kCGLBadConnection      = 10017 	/* invalid CoreGraphics connection */
 } CGLError;
 
+typedef enum _CGLContextParameter {
+   kCGLCPSwapRectangle    = 200,
+   kCGLCPSwapInterval     = 222,
+   kCGLCPDispatchTableSize = 224,
+   kCGLCPClientStorage    = 226,
+   kCGLCPSurfaceTexture    = 228,
+   kCGLCPSurfaceOrder      = 235,
+   kCGLCPSurfaceOpacity    = 236,
+   kCGLCPSurfaceBackingSize = 304,
+   kCGLCPSurfaceSurfaceVolatile = 306,
+   kCGLCPReclaimResources  = 308,
+   kCGLCPCurrentRendererID  = 309,
+   kCGLCPGPUVertexProcessing  = 310,
+   kCGLCPGPUFragmentProcessing  = 311,
+   kCGLCPHasDrawable             = 314,
+   kCGLCPMPSwapsInFlight         = 315,
+} CGLContextParameter;
+
 /* Pixel format manipulation */
 CGLError CGLChoosePixelFormat(const CGLPixelFormatAttribute *attribs,
                               CGLPixelFormatObj *pix,
                               long *npix);
 CGLError CGLDestroyPixelFormat(CGLPixelFormatObj pix);
+CGLPixelFormatObj CGLGetPixelFormat ( CGLContextObj ctx );
 
 /* Context manipulation */
 CGLError CGLCreateContext(CGLPixelFormatObj pix,
                           CGLContextObj share,
                           CGLContextObj* ctx);
+void CGLReleaseContext(CGLContextObj ctx);
 CGLError CGLDestroyContext(CGLContextObj ctx);
 CGLError CGLSetCurrentContext(CGLContextObj ctx);
+CGLContextObj CGLGetCurrentContext (void);
+CGLError CGLFlushDrawable ( CGLContextObj ctx);
+CGLError CGLSetParameter ( CGLContextObj ctx, CGLContextParameter pname, const int *params );
+CGLError CGLCopyContext ( CGLContextObj src, CGLContextObj dst, int mask );
+
+
 
 /* PBuffer manipulation */
 CGLError CGLCreatePBuffer(long width,
diff --git a/make/stub_includes/opengl/GL3/gl3.h b/make/stub_includes/opengl/GL3/gl3.h
index 7db3851bd..437830dfa 100755
--- a/make/stub_includes/opengl/GL3/gl3.h
+++ b/make/stub_includes/opengl/GL3/gl3.h
@@ -1067,6 +1067,52 @@ typedef void GLvoid;
 #define GL_COPY_WRITE_BUFFER              0x8F37
 #endif
 
+#ifndef GL_ARB_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#endif
+
 
 /*************************************************************/
 
diff --git a/make/stub_includes/opengl/macosx-window-system.h b/make/stub_includes/opengl/macosx-window-system.h
index f43adb546..7d2704be4 100644
--- a/make/stub_includes/opengl/macosx-window-system.h
+++ b/make/stub_includes/opengl/macosx-window-system.h
@@ -9,27 +9,36 @@
 
 typedef int Bool;
 
+// CGL ..
+void CGLQueryPixelFormat(void* pixelFormat, int* iattrs, int niattrs, int* ivalues);
+
+// NS ..
 void* createPixelFormat(int* iattrs, int niattrs, int* ivalues);
 void queryPixelFormat(void* pixelFormat, int* iattrs, int niattrs, int* ivalues);
 void deletePixelFormat(void* pixelFormat);
 
+// NS ..
+void *getCurrentContext(void);
+void *getNSView(void* nsContext);
+
 void* createContext(void* shareContext,
                     void* nsView,
                     void* pixelFormat,
                     int* viewNotReady);
+void *getCGLContext(void* nsContext);
 Bool  makeCurrentContext(void* nsContext);
-Bool  clearCurrentContext(void* nsContext);
+Bool  clearCurrentContext(void *nsContext);
 Bool  deleteContext(void* nsContext);
 Bool  flushBuffer(void* nsContext);
-void  setContextOpacity(void* context, int opacity);
+void  setContextOpacity(void* nsContext, int opacity);
 void  updateContext(void* nsContext);
 void  copyContext(void* destContext, void* srcContext, int mask);
 
 void* updateContextRegister(void* nsContext, void* nsView);
-void  updateContextUnregister(void* nsContext, void* nsView, void* updater);
+void  updateContextUnregister(void* updater);
 
 void* createPBuffer(int renderTarget, int internalFormat, int width, int height);
-Bool destroyPBuffer(void* nsContext, void* pBuffer);
+Bool destroyPBuffer(void* pBuffer);
 void setContextPBuffer(void* nsContext, void* pBuffer);
 void setContextTextureImageToPBuffer(void* nsContext, void* pBuffer, int colorBuffer);