Changeset 22509 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Aug 27, 2009 11:46:29 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL-OSX: Initial version for the Cocoa port.

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• render/renderspu.c (modified) (2 diffs)
• render/renderspu.h (modified) (10 diffs)
• render/renderspu_cocoa.c (added)
• render/renderspu_cocoa_helper.h (added)
• render/renderspu_cocoa_helper.m (added)
• render/renderspu_init.c (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -234 +234 @@
 VBoxOGLrenderspu_SOURCES.solaris = render/renderspu_glx.c
 VBoxOGLrenderspu_SOURCES.freebsd = render/renderspu_glx.c
-VBoxOGLrenderspu_SOURCES.darwin  = render/renderspu_agl.c
+ifdef VBOX_WITH_COCOA_QT
+ VBoxOGLrenderspu_SOURCES.darwin = \
+    render/renderspu_cocoa.c \
+    render/renderspu_cocoa_helper.m
+ VBoxOGLrenderspu_LDFLAGS.darwin += -framework AppKit
+else
+ VBoxOGLrenderspu_SOURCES.darwin = render/renderspu_agl.c
+endif
 VBoxOGLrenderspu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLrenderspu.dylib
 VBoxOGLrenderspu_LIBS = \

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -1015 +1015 @@
 
 #if defined(DARWIN)
+# ifdef VBOX_WITH_COCOA_QT
 void renderspuFlush()
 {
-    glFlush();
+    renderspu_SystemFlush();
 }
 
 void renderspuFinish()
 {
-    glFinish();
-}
+    renderspu_SystemFinish();
+}
+
+void renderspuBindFramebufferEXT(GLenum target, GLuint framebuffer)
+{
+    renderspu_SystemBindFramebufferEXT(target, framebuffer);
+}
+# endif
 #endif
 
@@ -1063 +1070 @@
     FILLIN( "GetString", renderspuGetString );
 #if defined(DARWIN)
+# ifdef VBOX_WITH_COCOA_QT
+    FILLIN( "Flush", renderspuFlush );
     FILLIN( "Finish", renderspuFinish );
-    FILLIN( "Flush", renderspuFlush );
+    FILLIN( "BindFramebufferEXT", renderspuBindFramebufferEXT );
+# endif
 #endif
     return i;

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -13 +13 @@
 #define RENDER_APIENTRY __stdcall
 #elif defined(DARWIN)
-#include <AGL/AGL.h>
+# ifndef VBOX_WITH_COCOA_QT
+#  include <AGL/AGL.h>
+# else
+#  include "renderspu_cocoa_helper.h"
+# endif
 #define RENDER_APIENTRY
 #else
@@ -29 +33 @@
 
 #ifdef RT_OS_DARWIN
+# ifndef VBOX_WITH_COCOA_QT
 enum
 {
@@ -44 +49 @@
 };
 pascal OSStatus windowEvtHndlr(EventHandlerCallRef myHandler, EventRef event, void* userData);
+# endif
 #endif /* RT_OS_DARWIN */
 
@@ -55 +61 @@
     HDC device_context;
 #elif defined(DARWIN)
+# ifndef VBOX_WITH_COCOA_QT
     WindowRef window;
+# endif
 #elif defined(GLX)
     Display *dpy;
@@ -82 +90 @@
     HDC device_context;
 #elif defined(DARWIN)
+# ifndef VBOX_WITH_COCOA_QT
     WindowRef window;
     WindowRef nativeWindow; /**< for render_to_app_window */
@@ -90 +99 @@
     RgnHandle hVisibleRegion;
     /* unsigned long context_ptr; */
+# else
+    NativeViewRef window;
+    NativeViewRef nativeWindow; /**< for render_to_app_window */
+    NativeGLCtxRef *currentCtx;
+# endif
 #elif defined(GLX)
     Window window;
@@ -117 +131 @@
     HGLRC hRC;
 #elif defined(DARWIN)
+# ifndef VBOX_WITH_COCOA_QT
     AGLContext context;
+# else
+    NativeGLCtxRef context;
+# endif
 #elif defined(GLX)
     GLXContext context;
@@ -217 +235 @@
 
 #ifdef RT_OS_DARWIN
+# ifndef VBOX_WITH_COCOA_QT
     RgnHandle hRootVisibleRegion;
     RTSEMFASTMUTEX syncMutex;
@@ -225 +244 @@
     uint64_t uiDockUpdateTS;
     bool fInit;
+# endif
 #endif /* RT_OS_DARWIN */
 } RenderSPU;
@@ -278 +298 @@
 #ifdef RT_OS_DARWIN
 extern void renderspu_SystemSetRootVisibleRegion(GLint cRects, GLint *pRects);
+# ifdef VBOX_WITH_COCOA_QT
+extern void renderspu_SystemFlush();
+extern void renderspu_SystemFinish();
+extern void renderspu_SystemBindFramebufferEXT(GLenum target, GLuint framebuffer);
+# endif
 #endif
 extern void renderspu_SystemShowWindow( WindowInfo *window, GLboolean showIt );

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -214 +214 @@
 
 #ifdef DARWIN
-# ifndef __LP64__ /** @todo port to 64-bit darwin. */
+# ifdef VBOX_WITH_COCOA_QT
+# else /* VBOX_WITH_COCOA_QT */
     render_spu.hRootVisibleRegion = 0;
     render_spu.currentBufferName = 1;
@@ -240 +241 @@
                                     NULL, NULL);
     render_spu.fInit = true;
-# endif /* !__LP64__ */
+# endif /* VBOX_WITH_COCOA_QT */
 #endif /* DARWIN */
 
@@ -386 +387 @@
 
 #ifdef RT_OS_DARWIN
-# ifndef __LP64__ /** @todo port to 64-bit darwin. */
+# ifndef VBOX_WITH_COCOA_QT
     render_spu.fInit = false;
     DisposeEventHandlerUPP(render_spu.hParentEventHandler);
@@ -399 +400 @@
     render_spu.uiDockUpdateTS = 0;
     RTSemFastMutexDestroy(render_spu.syncMutex);
-# endif /* __LP64__ */
+# else /* VBOX_WITH_COCOA_QT */
+# endif /* VBOX_WITH_COCOA_QT */
 #endif /* RT_OS_DARWIN */