Changeset 22189 in vbox

Timestamp:

Aug 11, 2009 7:28:42 PM (16 years ago)

Author:

vboxsync

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

50975

Message:

video hw accel: propper report supported functionality, some code cleaning

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/Graphics/Display/vbox.c (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -254 +254 @@
 # ifdef VBOX_WITH_VIDEOHWACCEL
 #pragma pack(1)
+
+#define VBOXVHWA_VERSION_MAJ 0
+#define VBOXVHWA_VERSION_MIN 0
+#define VBOXVHWA_VERSION_BLD 1
+#define VBOXVHWA_VERSION_RSV 0
 
 typedef enum
@@ -511 +516 @@
 #define VBOXVHWA_OFFSET64_VOID        (~0L)
 
+typedef struct _VBOXVHWA_VERSION
+{
+    uint32_t maj;
+    uint32_t min;
+    uint32_t bld;
+    uint32_t reserved;
+} VBOXVHWA_VERSION;
+
 typedef struct _VBOXVHWACMD_QUERYINFO1
 {
-    uint32_t cfgFlags;
-    uint32_t caps;
-    uint32_t caps2;
-    uint32_t colorKeyCaps;
-    uint32_t stretchCaps;
-    uint32_t surfaceCaps;
-    uint32_t numOverlays;
-    uint32_t numFourCC;
-
+    union
+    {
+        struct
+        {
+            VBOXVHWA_VERSION guestVersion;
+        } in;
+
+        struct
+        {
+            uint32_t cfgFlags;
+            uint32_t caps;
+
+            uint32_t caps2;
+            uint32_t colorKeyCaps;
+
+            uint32_t stretchCaps;
+            uint32_t surfaceCaps;
+
+            uint32_t numOverlays;
+            uint32_t curOverlays;
+
+            uint32_t numFourCC;
+            uint32_t reserved;
+        } out;
+    } u;
 } VBOXVHWACMD_QUERYINFO1;
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

@@ -878 +878 @@
 {
     VBOXVHWACMD* pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_QUERY_INFO1, sizeof(VBOXVHWACMD_QUERYINFO1));
+    VBOXVHWACMD_QUERYINFO1 *pInfo1;
     if (!pCmd)
     {
@@ -883 +884 @@
         return NULL;
     }
+
+    if (!pCmd)
+    {
+        DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
+        return NULL;
+    }
+
+    pInfo1 = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
+    pInfo1->u.in.guestVersion.maj = VBOXVHWA_VERSION_MAJ;
+    pInfo1->u.in.guestVersion.min = VBOXVHWA_VERSION_MIN;
+    pInfo1->u.in.guestVersion.bld = VBOXVHWA_VERSION_BLD;
+    pInfo1->u.in.guestVersion.reserved = VBOXVHWA_VERSION_RSV;
 
     if(vboxVHWACommandSubmit (ppdev, pCmd))
@@ -933 +946 @@
     }
 
-    ppdev->vhwaInfo.caps = pInfo->caps;
-    ppdev->vhwaInfo.caps2 = pInfo->caps2;
-    ppdev->vhwaInfo.colorKeyCaps = pInfo->colorKeyCaps;
-    ppdev->vhwaInfo.stretchCaps = pInfo->stretchCaps;
-    ppdev->vhwaInfo.surfaceCaps = pInfo->surfaceCaps;
-    ppdev->vhwaInfo.numOverlays = pInfo->numOverlays;
-    ppdev->vhwaInfo.numFourCC = pInfo->numFourCC;
-    ppdev->vhwaInfo.bVHWAEnabled = (pInfo->cfgFlags & VBOXVHWA_CFG_ENABLED);
+    ppdev->vhwaInfo.caps = pInfo->u.out.caps;
+    ppdev->vhwaInfo.caps2 = pInfo->u.out.caps2;
+    ppdev->vhwaInfo.colorKeyCaps = pInfo->u.out.colorKeyCaps;
+    ppdev->vhwaInfo.stretchCaps = pInfo->u.out.stretchCaps;
+    ppdev->vhwaInfo.surfaceCaps = pInfo->u.out.surfaceCaps;
+    ppdev->vhwaInfo.numOverlays = pInfo->u.out.numOverlays;
+    ppdev->vhwaInfo.numFourCC = pInfo->u.out.numFourCC;
+    ppdev->vhwaInfo.bVHWAEnabled = (pInfo->u.out.cfgFlags & VBOXVHWA_CFG_ENABLED);
     vboxVHWAFreeHostInfo1(ppdev, pInfo);
     return VINF_SUCCESS;

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

@@ -1387 +1387 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
+
+
+    static bool isAcceleration2DVideoAvailable();
 #endif
 

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

@@ -749 +749 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    static bool isAcceleration2DVideoAvailable() { /* TODO: */ return true; }
+    static bool isAcceleration2DVideoAvailable();
     VBoxDefs::RenderMode vmAcceleration2DVideoRenderMode() { return VBoxDefs::QGLMode; }
 #endif

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

@@ -36 +36 @@
 #endif
 #include "VBoxUpdateDlg.h"
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+#include "VBoxFrameBuffer.h"
+#endif
 
 /* Qt includes */
@@ -4065 +4069 @@
     }
 }
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+/* static */
+bool VBoxGlobal::isAcceleration2DVideoAvailable()
+{
+    return VBoxQGLFrameBuffer::isAcceleration2DVideoAvailable();
+}
+#endif
 
 // Public slots