Changeset 20090 in vbox for trunk/src/VBox/Main

Timestamp:

May 27, 2009 3:09:48 PM (16 years ago)

Author:

vboxsync

Message:

Main: enable 3d hardware support test

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -111 +111 @@
 #endif
 
-//#ifdef VBOX_WITH_CROGL
-//# include "cr_spu.h"
-//#endif /* VBOX_WITH_CROGL */
+#ifdef VBOX_WITH_CROGL
+# include "cr_spu.h"
+#endif /* VBOX_WITH_CROGL */
 
 #include <iprt/asm.h>
@@ -253 +253 @@
     }
 
-    f3DAccelerationSupported = true;
     /* Test for 3D hardware acceleration support */
-//    f3DAccelerationSupported = false;
-//#ifdef VBOX_WITH_CROGL
-//    SPU *spu;
-//    spu = crSPULoad(NULL, 0, "render", NULL, NULL);
-//    if (spu)
-//    {
-//        crSPUUnloadChain(spu);
-//        f3DAccelerationSupported = true;
-//    }
-//
-//#endif /* VBOX_WITH_CROGL */
+    f3DAccelerationSupported = false;
+
+#ifdef VBOX_WITH_CROGL
+    SPU *spu;
+    spu = crSPULoad(NULL, 0, "render", NULL, NULL);
+    if (spu)
+    {
+        crSPUUnloadChain(spu);
+        f3DAccelerationSupported = true;
+    }
+#endif /* VBOX_WITH_CROGL */
 
     setReady(true);

trunk/src/VBox/Main/Makefile.kmk

@@ -402 +402 @@
 
 ifdef VBOX_WITH_CROGL
- VBoxSVC_INCS += $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/include
+ VBoxSVC_INCS += $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
+ VBoxSVC_DEFS         += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS)
+ VBoxSVC_DEFS.win     += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win)
+ VBoxSVC_DEFS.linux   += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux)
+ VBoxSVC_DEFS.solaris += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.solaris)
+ VBoxSVC_DEFS.darwin  += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin)
+ VBoxSVC_LIBS         += \
+    $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
+    $(VBOX_LIB_OGL_HOSTCRUTIL)
 endif