Changeset 40845 in vbox

Timestamp:

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

Author:

vboxsync

Message:

3D check: direct invocation on the client side

Location:

trunk

Files:

• include/VBox/VBoxOGLTest.h (added)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/OpenGLTest (added)
• src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp (moved) (moved from trunk/src/VBox/Main/src-server/generic/OpenGLTest.cpp ) (1 diff)
• src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp (moved) (moved from trunk/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp )
• src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp (moved) (moved from trunk/src/VBox/Main/src-server/darwin/OpenGLTestDarwin.cpp ) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (4 diffs)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/HostImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -227 +227 @@
  VirtualBox_LDFLAGS.darwin += -framework OpenGL
 endif
+
+VirtualBox_LIBS += $(VBoxOGLTest_1_TARGET)
 
 # Headers containing definitions of classes that use the Q_OBJECT macro.

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -131 +131 @@
 #include <iprt/mem.h>
 #endif
+
+#include <VBox/VBoxOGLTest.h>
 
 //#define VBOX_WITH_FULL_DETAILS_REPORT /* hidden for now */
@@ -4792 +4794 @@
     }
     mHost = virtualBox().GetHost();
-    m3DAvailable = mHost.GetAcceleration3DAvailable();
+    m3DAvailable = VBoxOglIs3DAccelerationSupported();
 
     /* create default non-null global settings */

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 ();

trunk/src/VBox/Main/Makefile.kmk

@@ -274 +274 @@
         socket \
         $(LIB_VMM)
+        
+ifdef VBOX_WITH_CROGL
+ VBoxSVC_LIBS += $(VBoxOGLTest_1_TARGET) 
+endif
 
 VBoxSVC_INTERMEDIATES = \
@@ -338 +342 @@
         src-server/darwin/HostPowerDarwin.cpp
 
-ifdef VBOX_WITH_CROGL
-  ifneq ($(KBUILD_TARGET),darwin)
-    VBoxSVC_SOURCES += src-server/generic/OpenGLTest.cpp
-  endif
- VBoxSVC_SOURCES.darwin += src-server/darwin/OpenGLTestDarwin.cpp
-endif
-
 VBoxSVC_SOURCES.win = \
         src-server/win/svcmain.cpp \
@@ -494 +491 @@
 
 OTHER_CLEAN += $(VBOX_AUTOGEN_EVENT_H) $(VBOX_AUTOGEN_EVENT_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 = src-server/generic/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
-
 
 ifdef VBOX_WITH_XPCOM
@@ -627 +584 @@
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
 endif
+
+ifdef VBOX_WITH_CROGL
+ VBoxC_LIBS += $(VBoxOGLTest_1_TARGET) 
+endif
+
 
 VBoxC_INTERMEDIATES =            \

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -69 +69 @@
 #ifdef VBOX_WITH_CROGL
 # include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+#include <VBox/VBoxOGLTest.h>
 #endif
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -2522 +2523 @@
             if (fEnabled3D)
             {
-                BOOL fSupports3D = false;
-                hrc = host->COMGETTER(Acceleration3DAvailable)(&fSupports3D); H();
+                BOOL fSupports3D = VBoxOglIs3DAccelerationSupported();
                 if (!fSupports3D)
                     return VMSetError(pVM, VERR_NOT_AVAILABLE, RT_SRC_POS,

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -123 +123 @@
 
 #ifdef VBOX_WITH_CROGL
-extern bool is3DAccelerationSupported();
+#include <VBox/VBoxOGLTest.h>
 #endif /* VBOX_WITH_CROGL */
 
@@ -364 +364 @@
 
 #ifdef VBOX_WITH_CROGL
-    m->f3DAccelerationSupported = is3DAccelerationSupported();
+    m->f3DAccelerationSupported = VBoxOglIs3DAccelerationSupported();
 #endif /* VBOX_WITH_CROGL */
 
@@ -1082 +1082 @@
 
     *aSupported = m->f3DAccelerationSupported;
+
+#ifdef DEBUG_misha
+    AssertMsgFailed(("should not be here any more!\n"));
+#endif
 
     return S_OK;