Changeset 22247 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 13, 2009 9:04:28 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: more saved state support impl, bugfixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• dd.c (modified) (2 diffs)
• driver.h (modified) (1 diff)
• vbox.c (modified) (1 diff)

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

@@ -657 +657 @@
             if (lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
             {
-                pBody->u.in.offSurface = 0;
+                pBody->SurfInfo.offSurface = 0;
             }
             else
             {
-                pBody->u.in.offSurface = VBOXVHWA_OFFSET64_VOID;
+                pBody->SurfInfo.offSurface = VBOXVHWA_OFFSET64_VOID;
             }
 
@@ -674 +674 @@
                         uint32_t surfSizeX = pBody->SurfInfo.sizeX;
                         uint32_t surfSizeY = pBody->SurfInfo.sizeY;
-                    pDesc->hHostHandle = pBody->u.out.hSurf;
+                    pDesc->hHostHandle = pBody->SurfInfo.hSurf;
                     lpSurfaceGlobal->dwReserved1 = (ULONG_PTR)pDesc;
                     lPitch = pBody->SurfInfo.pitch;

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -109 +109 @@
     volatile uint32_t cPendingFlipsTarg;
 #ifdef DEBUG
-    volatile uint64_t cFlipsCurr;
-    volatile uint64_t cFlipsTarg;
+    volatile uint32_t cFlipsCurr;
+    volatile uint32_t cFlipsTarg;
 #endif
 //    uint32_t cBitsPerPixel;

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

@@ -911 +911 @@
 VBOXVHWACMD_QUERYINFO2* vboxVHWAQueryHostInfo2(PPDEV ppdev, uint32_t numFourCC)
 {
-    VBOXVHWACMD* pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_QUERY_INFO2, sizeof(VBOXVHWACMD_QUERYINFO2));
+    VBOXVHWACMD* pCmd = vboxVHWACommandCreate (ppdev, VBOXVHWACMD_TYPE_QUERY_INFO2, VBOXVHWAINFO2_SIZE(numFourCC));
     VBOXVHWACMD_QUERYINFO2 *pInfo2;
     if (!pCmd)