Changeset 20160 in vbox

Timestamp:

May 29, 2009 4:23:25 PM (16 years ago)

Author:

vboxsync

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

47973

Message:

Main: use separate test for opengl hardware support on macos

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (3 diffs)
• darwin/OpenGLTestDarwin.cpp (added)

trunk/src/VBox/Main/HostImpl.cpp

@@ -112 +112 @@
 
 #ifdef VBOX_WITH_CROGL
-extern "C" {
- extern void * crSPULoad(void *, int, char *, char *, void *);
- extern void crSPUUnloadChain(void *);
-}
+# ifndef RT_OS_DARWIN
+   extern "C" {
+    extern void * crSPULoad(void *, int, char *, char *, void *);
+    extern void crSPUUnloadChain(void *);
+   }
+# else
+   extern bool is3DAccelerationSupported();
+# endif
 #endif /* VBOX_WITH_CROGL */
 
@@ -260 +264 @@
 
 #ifdef VBOX_WITH_CROGL
+#ifdef RT_OS_DARWIN
+    f3DAccelerationSupported = is3DAccelerationSupported();
+#else
     void *spu;
     spu = crSPULoad(NULL, 0, "render", NULL, NULL);
@@ -267 +274 @@
         f3DAccelerationSupported = true;
     }
+#endif
 #endif /* VBOX_WITH_CROGL */
 

trunk/src/VBox/Main/Makefile.kmk

@@ -275 +275 @@
 endif
 ifdef VBOX_WITH_CROGL
- VBoxSVC_LIBS += \
-        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
-        $(VBOX_LIB_OGL_HOSTCRUTIL)
+ ifneq ($(KBUILD_TARGET),darwin)
+  VBoxSVC_LIBS += \
+        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_OGL_HOSTCRUTIL)
+ endif
 endif
 
@@ -330 +332 @@
         darwin/HostPowerDarwin.cpp
 
+ifdef VBOX_WITH_CROGL
+ VBoxSVC_SOURCES.darwin += darwin/OpenGLTestDarwin.cpp
+endif
+
 VBoxSVC_SOURCES.win = \
         win/svcmain.cpp \
@@ -378 +384 @@
 endif
 VBoxSVC_LDFLAGS.darwin    = -framework IOKit -framework SystemConfiguration
+
+ifdef VBOX_WITH_CROGL
+ VBoxSVC_LDFLAGS.darwin += -framework OpenGL
+endif
+
 ifeq ($(KBUILD_TYPE),debug)
  VBoxSVC_LDFLAGS.linux   += -rdynamic # for backtrace_symbols()