Changeset 23740 in vbox

Timestamp:

Oct 13, 2009 7:54:22 PM (15 years ago)

Author:

vboxsync

Message:

joined 2D & 3D support test in one tool

Location:

trunk

Files:

• include/VBox/VBoxGL2D.h (added)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxGLSupportInfo.h (deleted)
• src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp (modified) (4 diffs)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/generic/OpenGLTestApp.cpp (modified) (2 diffs)

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

@@ -679 +679 @@
 if defined(VBOX_WITH_VIDEOHWACCEL)
  if1of ($(KBUILD_TARGET), win linux)
-  PROGRAMS += VBoxTestOGL2D
-  VBoxTestOGL2D_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE)
-  VBoxTestOGL2D_SOURCES = \
-      src/VBoxTestQGLApp.cpp \
+  LIBRARIES += VBoxOGL2D
+  VBoxOGL2D_TEMPLATE = VBOXR3STATIC
+  VBoxOGL2D_USES = qt4
+#  VBoxOGL2D_QTTOOL = QT4
+#  VBoxOGL2D_MOCTOOL = QT4
+#  VBoxOGL2D_UICTOOL = QT4
+#  VBoxOGL2D_RCCTOOL = QT4
+#  VBoxOGL2D_LRCTOOL = QT4
+  VBoxOGL2D_SDKS = QT4
+  VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)
+  VBoxOGL2D_QT_MODULES += OpenGL
+  VBoxOGL2D_SOURCES = \
       src/VBoxGLSupportInfo.cpp
-  VBoxTestOGL2D_QT_MODULES = Core Gui OpenGL
-  VBoxTestOGL2D_INCS = include
-  VBoxTestOGL2D_LDFLAGS.darwin += -framework OpenGL
-  VBoxTestOGL2D_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
-  VBoxTestOGL2D_LIBS.solaris += GL
  endif 
 endif

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -32 +32 @@
 #include <iprt/critsect.h>
 
-#include "VBoxGLSupportInfo.h"
+#include <VBox/VBoxGL2D.h>
 
 #define VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY 1

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -29 +29 @@
 #include "VBoxGlobal.h"
 
-#include "VBoxGLSupportInfo.h"
+#include <VBox/VBoxGL2D.h>
 
 /* Qt includes */
@@ -5197 +5197 @@
     static bool g_bVBoxVHWAChecked = false;
     static bool g_bVBoxVHWASupported = false;
+#ifndef DEBUG_misha
     if(!g_bVBoxVHWAChecked)
+#endif
     {
         g_bVBoxVHWAChecked = true;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp

@@ -20 +20 @@
  * additional information or have any questions.
  */
-#include "VBoxGLSupportInfo.h"
-
 #include <iprt/assert.h>
 #include <iprt/log.h>
@@ -35 +33 @@
 #include <QGLWidget>
 #include <QGLContext>
+
+#include <VBox/VBoxGL2D.h>
 
 /*****************/
@@ -550 +550 @@
 #if defined(RT_OS_WINDOWS)
     static char pszVBoxPath[RTPATH_MAX];
-    const char *papszArgs[3] = { NULL, "-test", NULL};
+    const char *papszArgs[] = { NULL, "-test", "2D", NULL};
     int rc;
     RTPROCESS Process;
@@ -558 +558 @@
     rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, false);
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL2D.exe");
+    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL.exe");
 #else
-    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL2D");
+    rc = RTPathAppend(pszVBoxPath, RTPATH_MAX, "VBoxTestOGL");
 #endif
     AssertRCReturn(rc, false);

trunk/src/VBox/Main/Makefile.kmk

@@ -462 +462 @@
 
 
-ifdef VBOX_WITH_CROGL
+if defined(VBOX_WITH_CROGL) || defined(VBOX_WITH_VIDEOHWACCEL) 
  ifneq ($(KBUILD_TARGET),darwin)
   #
@@ -468 +468 @@
   #
   PROGRAMS += VBoxTestOGL
-  VBoxTestOGL_TEMPLATE = VBOXMAINEXE
+  VBoxTestOGL_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE),VBOXMAINEXE)
   VBoxTestOGL_SOURCES = generic/OpenGLTestApp.cpp
   VBoxTestOGL_LIBS = \
-        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
-        $(VBOX_LIB_OGL_HOSTCRUTIL) \
+    $(if $(VBOX_WITH_CROGL), \
+          $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
+          $(VBOX_LIB_OGL_HOSTCRUTIL),) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
         $(LIB_RUNTIME)
+  VBoxTestOGL_DEFS += \
+    $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
+    $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
+  ifdef VBOX_WITH_VIDEOHWACCEL
+   VBoxTestOGL_QT_MODULES += Core Gui OpenGL
+   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
+   VBoxTestOGL_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+   VBoxTestOGL_LIBS.solaris += GL
+  endif
+  VBoxTestOGL_LDFLAGS.win = /SUBSYSTEM:windows
  endif
 endif

trunk/src/VBox/Main/generic/OpenGLTestApp.cpp

@@ -21 +21 @@
 
 #include <iprt/initterm.h>
+#include <iprt/getopt.h>
+#include <iprt/err.h>
+#include <iprt/assert.h>
 #ifdef RT_OS_WINDOWS
 #include <Windows.h>
 #endif
+
+#ifdef VBOX_WITH_CROGL
 
 extern "C" {
@@ -30 +35 @@
 }
 
-#ifndef RT_OS_WINDOWS
+
+static int vboxCheck3DAccelerationSupported()
+{
+    void *spu = crSPULoad(NULL, 0, "render", NULL, NULL);
+    if (spu)
+    {
+        crSPUUnloadChain(spu);
+        return 0;
+    }
+    return 1;
+}
+#endif
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+#include <QGLWidget>
+#include <QApplication>
+#include <VBox/VBoxGL2D.h>
+
+static int vboxCheck2DVideoAccelerationSupported()
+{
+    static int dummyArgc = 1;
+    static char * dummyArgv = "GlTest";
+    QApplication app (dummyArgc, &dummyArgv);
+
+    VBoxGLTmpContext ctx;
+    const QGLContext *pContext = ctx.makeCurrent();
+    if(pContext)
+    {
+        VBoxVHWAInfo supportInfo;
+        supportInfo.init(pContext);
+        if(supportInfo.isVHWASupported())
+            return 0;
+    }
+    return 1;
+}
+
+#endif
+
 int main(int argc, char **argv)
-#else
-extern "C" int WINAPI WinMain(HINSTANCE hInstance,
-    HINSTANCE /*hPrevInstance*/, LPSTR lpCmdLine, int /*nShowCmd*/)
-#endif
 {
-    void *spu;
-    int rc=1;
+    int rc=0;
 
     RTR3Init();
 
-    spu = crSPULoad(NULL, 0, "render", NULL, NULL);
-    if (spu)
+    if(argc < 3)
     {
-        crSPUUnloadChain(spu);
-        rc=0;
+#ifdef VBOX_WITH_CROGL
+        /* backwards compatibility: check 3D */
+        rc = vboxCheck3DAccelerationSupported();
+#endif
+    }
+    else
+    {
+        static const RTGETOPTDEF s_aOptionDefs[] =
+        {
+            { "--test",           't',   RTGETOPT_REQ_STRING },
+            { "-test",            't',   RTGETOPT_REQ_STRING },
+        };
+
+        RTGETOPTSTATE State;
+        int rc = RTGetOptInit(&State, argc-1, argv+1, &s_aOptionDefs[0], RT_ELEMENTS(s_aOptionDefs), 0, 0);
+        AssertRCReturn(rc, 49);
+
+        for (;;)
+        {
+            RTGETOPTUNION Val;
+            rc = RTGetOpt(&State, &Val);
+            if (!rc)
+                break;
+            switch (rc)
+            {
+                case 't':
+#ifdef VBOX_WITH_CROGL
+                    if (!strcmp(Val.psz, "3D") || !strcmp(Val.psz, "3d"))
+                    {
+                        rc = vboxCheck3DAccelerationSupported();
+                        break;
+                    }
+#endif
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                    if (!strcmp(Val.psz, "2D") || !strcmp(Val.psz, "2d"))
+                    {
+                        rc = vboxCheck2DVideoAccelerationSupported();
+                        break;
+                    }
+#endif
+                    rc = 1;
+                    break;
+                case VERR_GETOPT_UNKNOWN_OPTION:
+                case VINF_GETOPT_NOT_OPTION:
+                    rc = 1;
+                default:
+                    break;
+            }
+
+            if(rc)
+                break;
+        }
     }
 
     /*RTR3Term();*/
     return rc;
+
 }
 
+#ifdef RT_OS_WINDOWS
+extern "C" int WINAPI WinMain(HINSTANCE hInstance,
+    HINSTANCE /*hPrevInstance*/, LPSTR lpCmdLine, int /*nShowCmd*/)
+{
+    return main(__argc, __argv);
+}
+#endif
+