Changeset 22509 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51530

Message:

crOpenGL-OSX: Initial version for the Cocoa port.

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_spu.h (modified) (5 diffs)
• spu_loader/glloader.py (modified) (7 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_spu.h

@@ -20 +20 @@
 
 #ifdef DARWIN
-#include <OpenGL/OpenGL.h>
-#include <AGL/agl.h>
+# include <OpenGL/OpenGL.h>
+# ifdef VBOX_WITH_COCOA_QT
+# else
+#  include <AGL/agl.h>
+# endif
 #endif
 
@@ -150 +153 @@
 /*@}*/
 #elif defined(DARWIN)
+# ifndef VBOX_WITH_COCOA_QT
 /**
  * Apple/AGL
@@ -190 +194 @@
 typedef GLboolean (*aglUpdateContextFunc_t)( AGLContext );
 typedef GLboolean (*aglUseFontFunc_t)( AGLContext, GLint, Style, GLint, GLint, GLint, GLint );
+# endif
 
 typedef const GLubyte *(*glGetStringFunc_t)( GLenum );
@@ -321 +326 @@
     wglGetExtensionsStringEXTFunc_t wglGetExtensionsStringEXT;
 #elif defined(DARWIN)
+# ifndef VBOX_WITH_COCOA_QT
     aglCreateContextFunc_t          aglCreateContext;
     aglDestroyContextFunc_t         aglDestroyContext;
@@ -340 +346 @@
     aglEnableFunc_t                 aglEnable;
     aglDisableFunc_t                aglDisable;
+# endif
 
     CGLChoosePixelFormatFunc_t      CGLChoosePixelFormat;

trunk/src/VBox/GuestHost/OpenGL/spu_loader/glloader.py

@@ -31 +31 @@
 #define SYSTEM_GL "libGL.dylib"
 #define SYSTEM_CGL "OpenGL"
-#define SYSTEM_AGL "AGL"
+# ifndef VBOX_WITH_COCOA_QT
+#  define SYSTEM_AGL "AGL"
+# endif
 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
 #if defined(Linux)
@@ -52 +54 @@
 #define SYSTEM_GL_LIB_DIR   "/System/Library/Frameworks/OpenGL.framework/Libraries"
 #define SYSTEM_CGL_DIR  "/System/Library/Frameworks/OpenGL.framework"
-#define SYSTEM_AGL_DIR  "/System/Library/Frameworks/AGL.framework"
-
 static CRDLL *cglDll = NULL;
+# ifndef VBOX_WITH_COCOA_QT
+#  define SYSTEM_AGL_DIR  "/System/Library/Frameworks/AGL.framework"
 static CRDLL *aglDll = NULL;
+# endif
 #endif
 
@@ -259 +262 @@
         cglDll = NULL;
 
+# ifndef VBOX_WITH_COCOA_QT
         crDLLClose( aglDll );
         aglDll = NULL;
+# endif
 #endif
 }
@@ -290 +295 @@
 #ifdef DARWIN
         const char *env_cgl_syspath = crGetenv( "CR_SYSTEM_CGL_PATH" );
+# ifndef VBOX_WITH_COCOA_QT
         const char *env_agl_syspath = crGetenv( "CR_SYSTEM_AGL_PATH" );
+# endif
 #endif
         
@@ -318 +325 @@
         crDebug( "Found it in %s.", !env_cgl_syspath ? "default path" : env_cgl_syspath );
 
+# ifndef VBOX_WITH_COCOA_QT
         crDebug( "Looking for the system's AGL library..." );
         aglDll = __findSystemGL( env_agl_syspath, SYSTEM_AGL_DIR, SYSTEM_AGL );
@@ -327 +335 @@
 
         crDebug( "Found it in %s.", !env_agl_syspath ? "default path" : env_agl_syspath );
+# endif
 #endif
 """
@@ -454 +463 @@
 
 print '#elif defined(DARWIN)'
+print '# ifndef VBOX_WITH_COCOA_QT'
 for fun in useful_agl_functions:
         print '\tinterface->%s = (%sFunc_t) crDLLGetNoError( aglDll, "%s" );' % (fun,fun,fun)
+print '# endif'
 
 for fun in useful_cgl_functions: