Changeset 75655 in vbox

Timestamp:

Nov 21, 2018 11:30:22 PM (6 years ago)

Author:

vboxsync

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

126835

Message:

WDDM: extended GaScreenDefine

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPWddm.cpp (modified) (2 diffs)
• gallium/Svga.cpp (modified) (2 diffs)
• gallium/Svga.h (modified) (1 diff)
• gallium/SvgaCmd.cpp (modified) (2 diffs)
• gallium/SvgaCmd.h (modified) (1 diff)
• gallium/VBoxMPGaWddm.cpp (modified) (1 diff)
• gallium/VBoxMPGaWddm.h (modified) (1 diff)

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

@@ -5458 +5458 @@
     NTSTATUS Status = STATUS_SUCCESS;
     PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pSetVidPnSourceAddress->VidPnSourceId];
+#ifdef VBOX_WITH_MESA3D
+    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
+    {
+        GaScreenDefine(pDevExt->pGa, (uint32_t)pSetVidPnSourceAddress->PrimaryAddress.QuadPart,
+                       pSetVidPnSourceAddress->VidPnSourceId,
+                       pSource->VScreenPos.x, pSource->VScreenPos.y,
+                       pSource->AllocData.SurfDesc.width, pSource->AllocData.SurfDesc.height);
+        return STATUS_SUCCESS;
+    }
+#endif
+
     PVBOXWDDM_ALLOCATION pAllocation;
     Assert(pSetVidPnSourceAddress->hAllocation);
@@ -5489 +5500 @@
                                                     pSetVidPnSourceAddress->PrimaryAddress.QuadPart);
     }
-
-#ifdef VBOX_WITH_MESA3D
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        GaScreenDefine(pDevExt->pGa, (uint32_t)pSetVidPnSourceAddress->PrimaryAddress.QuadPart,
-                       pSetVidPnSourceAddress->VidPnSourceId,
-                       pSource->AllocData.SurfDesc.width, pSource->AllocData.SurfDesc.height);
-    }
-#endif
 
     pSource->u8SyncState &= ~VBOXWDDM_HGSYNC_F_SYNCED_LOCATION;

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

@@ -213 +213 @@
                           uint32_t u32Offset,
                           uint32_t u32ScreenId,
+                          int32_t xOrigin,
+                          int32_t yOrigin,
                           uint32_t u32Width,
                           uint32_t u32Height)
@@ -225 +227 @@
     if (pvCmd)
     {
-        SvgaCmdDefineScreen(pvCmd, u32ScreenId, u32Width, u32Height, u32Offset);
+        SvgaCmdDefineScreen(pvCmd, u32ScreenId, true,
+                            xOrigin, yOrigin, u32Width, u32Height,
+                            /* fPrimary = */ false, u32Offset, /* fBlank = */ false);
         pvCmd = (uint8_t *)pvCmd + sizeof(uint32_t) + sizeof(SVGAScreenObject);
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.h

@@ -129 +129 @@
                           uint32_t u32Offset,
                           uint32_t u32ScreenId,
+                          int32_t xOrigin,
+                          int32_t yOrigin,
                           uint32_t u32Width,
                           uint32_t u32Height);

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

@@ -25 +25 @@
  */
 
-void SvgaCmdDefineScreen(void *pvCmd, uint32_t u32Id, uint32_t u32Width, uint32_t u32Height, uint32_t u32Offset)
+void SvgaCmdDefineScreen(void *pvCmd, uint32_t u32Id, bool fActivate,
+                         int32_t xOrigin, int32_t yOrigin, uint32_t u32Width, uint32_t u32Height,
+                         bool fPrimary, uint32_t u32VRAMOffset, bool fBlank)
 {
     uint32_t *pu32Id = (uint32_t *)pvCmd;
@@ -32 +34 @@
     *pu32Id = SVGA_CMD_DEFINE_SCREEN;
 
-    pCommand->screen.structSize = sizeof(SVGAScreenObject);
-    pCommand->screen.id = u32Id;
-    pCommand->screen.flags = SVGA_SCREEN_MUST_BE_SET | SVGA_SCREEN_IS_PRIMARY;
-    pCommand->screen.size.width = u32Width;
+    pCommand->screen.structSize  = sizeof(SVGAScreenObject);
+    pCommand->screen.id          = u32Id;
+    pCommand->screen.flags       = SVGA_SCREEN_MUST_BE_SET;
+    pCommand->screen.flags      |= fPrimary  ? SVGA_SCREEN_IS_PRIMARY : 0;
+    pCommand->screen.flags      |= !fActivate? SVGA_SCREEN_DEACTIVATE : 0;
+    pCommand->screen.flags      |= fBlank    ? SVGA_SCREEN_BLANKING   : 0;
+    pCommand->screen.size.width  = u32Width;
     pCommand->screen.size.height = u32Height;
-    pCommand->screen.root.x = 0;
-    pCommand->screen.root.y = 0;
-    pCommand->screen.backingStore.ptr.gmrId = SVGA_GMR_FRAMEBUFFER;
-    pCommand->screen.backingStore.ptr.offset = u32Offset;
-    pCommand->screen.backingStore.pitch = u32Width * 4;
-    pCommand->screen.cloneCount = 1;
+    pCommand->screen.root.x      = xOrigin;
+    pCommand->screen.root.y      = yOrigin;
+    pCommand->screen.backingStore.ptr.gmrId  = SVGA_GMR_FRAMEBUFFER;
+    pCommand->screen.backingStore.ptr.offset = u32VRAMOffset;
+    pCommand->screen.backingStore.pitch      = u32Width * 4;
+    pCommand->screen.cloneCount  = 1;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/SvgaCmd.h

@@ -21 +21 @@
 #include "SvgaHw.h"
 
-void SvgaCmdDefineScreen(void *pvCmd, uint32_t u32Id, uint32_t u32Width, uint32_t u32Height, uint32_t u32Offset);
+void SvgaCmdDefineScreen(void *pvCmd, uint32_t u32Id, bool fActivate,
+                         int32_t xOrigin, int32_t yOrigin, uint32_t u32Width, uint32_t u32Height,
+                         bool fPrimary, uint32_t u32VRAMOffset, bool fBlank);
 void SvgaCmdDestroyScreen(void *pvCmd, uint32_t u32Id);
 void SvgaCmdUpdate(void *pvCmd, uint32_t u32X, uint32_t u32Y, uint32_t u32Width, uint32_t u32Height);

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

@@ -469 +469 @@
                         uint32_t u32Offset,
                         uint32_t u32ScreenId,
+                        int32_t xOrigin,
+                        int32_t yOrigin,
                         uint32_t u32Width,
                         uint32_t u32Height)
 {
-    return SvgaScreenDefine(pGaDevExt->hw.pSvga, u32Offset, u32ScreenId, u32Width, u32Height);
+    return SvgaScreenDefine(pGaDevExt->hw.pSvga, u32Offset, u32ScreenId, xOrigin, yOrigin, u32Width, u32Height);
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/VBoxMPGaWddm.h

@@ -31 +31 @@
                         uint32_t u32Offset,
                         uint32_t u32ScreenId,
+                        int32_t xOrigin,
+                        int32_t yOrigin,
                         uint32_t u32Width,
                         uint32_t u32Height);