Changeset 40845 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 10, 2012 1:07:39 PM (13 years ago)

Author:

vboxsync

Message:

3D check: direct invocation on the client side

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• OpenGLTest (added)
• OpenGLTest/OpenGLTest.cpp (moved) (moved from trunk/src/VBox/Main/src-server/generic/OpenGLTest.cpp ) (1 diff)
• OpenGLTest/OpenGLTestApp.cpp (moved) (moved from trunk/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp )
• OpenGLTest/OpenGLTestDarwin.cpp (moved) (moved from trunk/src/VBox/Main/src-server/darwin/OpenGLTestDarwin.cpp ) (1 diff)

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

@@ -274 +274 @@
 endif
 
+LIBRARIES += VBoxOGLTest
+VBoxOGLTest_TEMPLATE = VBOXR3STATIC
+ifneq ($(KBUILD_TARGET),darwin)
+  VBoxOGLTest_SOURCES = OpenGLTest/OpenGLTest.cpp
+endif
+VBoxOGLTest_SOURCES.darwin = OpenGLTest/OpenGLTestDarwin.cpp
+
+#
+# VBoxTestOGL - OpenGL support test app.
+# Note! Doesn't link with VBOX_WITH_DEBUG_VCC_CRT defined because it uses Qt.
+#
+if (   defined(VBOX_WITH_QTGUI) \
+    && (defined(VBOX_WITH_CROGL) || defined(VBOX_WITH_VIDEOHWACCEL)) \
+    && !defined(VBOX_WITH_DEBUG_VCC_CRT))
+ ifneq ($(KBUILD_TARGET),darwin)
+  ifdef VBOX_WITH_VIDEOHWACCEL
+   USES += qt4
+  endif
+  PROGRAMS += VBoxTestOGL
+  VBoxTestOGL_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE),VBOXMAINEXE)
+  VBoxTestOGL_SOURCES = OpenGLTest/OpenGLTestApp.cpp
+  VBoxTestOGL_LIBS = \
+    $(if $(VBOX_WITH_CROGL), \
+      $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
+      $(VBOX_LIB_OGL_HOSTCRUTIL),) \
+    $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
+    $(LIB_RUNTIME)
+  VBoxTestOGL_DEFS += \
+    $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
+    $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,) \
+    VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
+    $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
+  ifdef VBOX_WITH_VIDEOHWACCEL
+   VBoxTestOGL_QT_MODULES += Core Gui OpenGL
+   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
+   VBoxTestOGL_LIBS.win += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+   if1of ($(KBUILD_TARGET), solaris linux freebsd)
+    # must come after VBoxOGL2D, therefore don't set the arch-specific LIBS variable here!
+    VBoxTestOGL_LIBS += GL
+   endif
+  endif
+  VBoxTestOGL_LDFLAGS.win = /SUBSYSTEM:windows
+ endif
+endif
+
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp

@@ -26 +26 @@
 #include <iprt/thread.h>
 
-bool is3DAccelerationSupported()
+#include <VBox/VBoxOGLTest.h>
+
+bool RTCALL VBoxOglIs3DAccelerationSupported()
 {
     static char pszVBoxPath[RTPATH_MAX];

trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp

@@ -26 +26 @@
 #endif /* VBOX_WITH_COCOA_QT */
 
-bool is3DAccelerationSupported()
+#include <VBox/VBoxOGLTest.h>
+
+bool RTCALL VBoxOglIs3DAccelerationSupported()
 {
     CGDirectDisplayID   display = CGMainDisplayID ();