Changeset 55971 in vbox for trunk

Timestamp:

May 20, 2015 3:17:50 PM (10 years ago)

Author:

vboxsync

Message:

3D: WDDM: consider sub-regions on FLIP operation.

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server.h (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)

trunk/include/VBox/VBoxVideo.h

@@ -1850 +1850 @@
     VBOXCMDVBVA_HDR Hdr;
     VBOXCMDVBVA_ALLOCINFO src;
+    VBOXCMDVBVA_RECT aRects[1];
 } VBOXCMDVBVA_FLIP;
+
+#define VBOXCMDVBVA_SIZEOF_FLIPSTRUCT_MIN (RT_OFFSETOF(VBOXCMDVBVA_FLIP, aRects))
 
 typedef struct VBOXCMDVBVA_CLRFILL_HDR

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -6157 +6157 @@
     }
 
+#ifdef VBOX_WDDM_DUMP_REGIONS_ON_PRESENT
+    LogRel(("%s: [%ld, %ld, %ld, %ld] -> [%ld, %ld, %ld, %ld] (SubRectCnt=%u)\n",
+        pPresent->Flags.Blt ? "Blt" : (pPresent->Flags.Flip ? "Flip" : (pPresent->Flags.ColorFill ? "ColorFill" : "Unknown OP")),
+        pPresent->SrcRect.left, pPresent->SrcRect.top, pPresent->SrcRect.right, pPresent->SrcRect.bottom,
+        pPresent->DstRect.left, pPresent->DstRect.top, pPresent->DstRect.right, pPresent->DstRect.bottom,
+        pPresent->SubRectCnt));
+    for (unsigned int i = 0; i < pPresent->SubRectCnt; i++)
+        LogRel(("\tsub#%u = [%ld, %ld, %ld, %ld]\n", i, pPresent->pDstSubRects[i].left, pPresent->pDstSubRects[i].top, pPresent->pDstSubRects[i].right, pPresent->pDstSubRects[i].bottom));
+#endif
+
     if (pPresent->Flags.Blt)
     {
@@ -6295 +6305 @@
 
         cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        cbPrivateData = sizeof (*pFlip);
+        paRects = pFlip->aRects;
+        cbPrivateData = VBOXCMDVBVA_SIZEOF_FLIPSTRUCT_MIN;
     }
     else if (pPresent->Flags.ColorFill)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp

@@ -3955 +3955 @@
 }
 
-int8_t crVBoxServerCrCmdFlipProcess(const VBOXCMDVBVA_FLIP *pFlip)
+int8_t crVBoxServerCrCmdFlipProcess(const VBOXCMDVBVA_FLIP *pFlip, uint32_t cbCmd)
 {
     uint32_t hostId;
+    const VBOXCMDVBVA_RECT *pPRects = pFlip->aRects;
+    uint32_t cRects;
+
     if (pFlip->Hdr.u8Flags & VBOXCMDVBVA_OPF_OPERAND1_ISID)
     {
@@ -3981 +3984 @@
     }
 
-    const RTRECT *pRect = CrVrScrCompositorRectGet(&hFb->Compositor);
-    crServerDispatchVBoxTexPresent(hostId, idFb, 0, 0, 1, (const GLint*)pRect);
-    return 0;
+    cRects = (cbCmd - VBOXCMDVBVA_SIZEOF_FLIPSTRUCT_MIN) / sizeof (VBOXCMDVBVA_RECT);
+    if (cRects > 0)
+    {
+        RTRECT *pRects = crVBoxServerCrCmdBltRecsUnpack(pPRects, cRects);
+        if (pRects)
+        {
+            crServerDispatchVBoxTexPresent(hostId, idFb, 0, 0, cRects, (const GLint*)pRects);
+            return 0;
+        }
+    }
+
+    return -1;
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -472 +472 @@
 int8_t crVBoxServerCrCmdBltProcess(const VBOXCMDVBVA_BLT_HDR *pCmd, uint32_t cbCmd);
 int8_t crVBoxServerCrCmdClrFillProcess(const VBOXCMDVBVA_CLRFILL_HDR *pCmd, uint32_t cbCmd);
-int8_t crVBoxServerCrCmdFlipProcess(const VBOXCMDVBVA_FLIP *pFlip);
+int8_t crVBoxServerCrCmdFlipProcess(const VBOXCMDVBVA_FLIP *pFlip, uint32_t cbCmd);
 
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -3553 +3553 @@
             const VBOXCMDVBVA_FLIP *pFlip;
 
-            if (cbCmd < sizeof (VBOXCMDVBVA_FLIP))
+            if (cbCmd < VBOXCMDVBVA_SIZEOF_FLIPSTRUCT_MIN)
             {
-                WARN(("invalid buffer size"));
+                WARN(("invalid buffer size (cbCmd(%u) < sizeof(VBOXCMDVBVA_FLIP)(%u))", cbCmd, sizeof(VBOXCMDVBVA_FLIP)));
                 return -1;
             }
 
             pFlip = (const VBOXCMDVBVA_FLIP*)pCmd;
-            return crVBoxServerCrCmdFlipProcess(pFlip);
+            return crVBoxServerCrCmdFlipProcess(pFlip, cbCmd);
         }
         case VBOXCMDVBVA_OPTYPE_BLT: