Changeset 51148 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Apr 25, 2014 7:31:35 PM (11 years ago)

Author:

vboxsync

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

93473

Message:

wddm/crOpenGL: fix visual artifacts after resize

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (7 diffs)

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

@@ -4836 +4836 @@
 }
 
-static void crVBoxServerCrCmdBltPrimaryUpdate(const VBVAINFOSCREEN *pScreen, const RTRECT *pRects, uint32_t cRects, uint32_t u32PrimaryID)
+static void crVBoxServerCrCmdBltPrimaryUpdate(const VBVAINFOSCREEN *pScreen, uint32_t cRects, const RTRECT *pRects)
 {
     if (!cRects)
         return;
 
+    uint32_t u32PrimaryID = pScreen->u32ViewIndex;
     bool fDirtyEmpty = true;
     RTRECT dirtyRect;
@@ -5006 +5007 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), cRects, pRects);
 
     return 0;
@@ -5105 +5106 @@
     {
         if (hSrcFb)
-            WARN(("blit from one framebuffer to another not supported properly"));
+        {
+            WARN(("blit from one framebuffer, wow"));
+
+            int rc = CrFbUpdateBegin(hSrcFb);
+            if (RT_SUCCESS(rc))
+            {
+                CrFbRegionsClear(hSrcFb);
+
+                CrFbUpdateEnd(hSrcFb);
+            }
+            else
+                WARN(("CrFbUpdateBegin failed %d", rc));
+        }
 
         CR_BLITTER_IMG Img;
@@ -5115 +5128 @@
         }
 
-        int rc = CrFbBltPutContentsNe(hDstFb, pPos, cRects, pRects, &Img);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("CrFbBltPutContentsNe failed %d", rc));
-            return -1;
-        }
+        const VBVAINFOSCREEN *pScreen = CrFbGetScreenInfo(hDstFb);
+        if (pScreen->u32Width == dstWidth && pScreen->u32Height == dstHeight)
+        {
+            int rc = CrFbBltPutContentsNe(hDstFb, pPos, cRects, pRects, &Img);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("CrFbBltPutContentsNe failed %d", rc));
+                return -1;
+            }
+        }
+        else
+        {
+            int rc = CrFbUpdateBegin(hDstFb);
+            if (RT_SUCCESS(rc))
+            {
+                CrFbRegionsClear(hDstFb);
+
+                CrFbUpdateEnd(hDstFb);
+            }
+            else
+                WARN(("CrFbUpdateBegin failed %d", rc));
+
+            rc = crVBoxServerCrCmdBltVramToVramMem(offSrcVRAM, srcWidth, srcHeight, offDstVRAM, dstWidth, dstHeight, pPos, cRects, pRects);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("crVBoxServerCrCmdBltVramToVramMem failed, %d", rc));
+                return -1;
+            }
+        }
+
+        crVBoxServerCrCmdBltPrimaryUpdate(pScreen, cRects, pRects);
 
         return 0;
@@ -5134 +5172 @@
         }
 
-        int rc = CrFbBltGetContents(hSrcFb, pPos, cRects, pRects, &Img);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("CrFbBltGetContents failed %d", rc));
-            return -1;
+        const VBVAINFOSCREEN *pScreen = CrFbGetScreenInfo(hSrcFb);
+        if (pScreen->u32Width == srcWidth && pScreen->u32Height == srcHeight)
+        {
+            int rc = CrFbBltGetContents(hSrcFb, pPos, cRects, pRects, &Img);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("CrFbBltGetContents failed %d", rc));
+                return -1;
+            }
+        }
+        else
+        {
+            int rc = CrFbUpdateBegin(hSrcFb);
+            if (RT_SUCCESS(rc))
+            {
+                CrFbRegionsClear(hSrcFb);
+
+                CrFbUpdateEnd(hSrcFb);
+            }
+            else
+                WARN(("CrFbUpdateBegin failed %d", rc));
+
+            rc = crVBoxServerCrCmdBltVramToVramMem(offSrcVRAM, srcWidth, srcHeight, offDstVRAM, dstWidth, dstHeight, pPos, cRects, pRects);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("crVBoxServerCrCmdBltVramToVramMem failed, %d", rc));
+                return -1;
+            }
         }
 
@@ -5275 +5336 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), cRects, pRects);
 
     return 0;
@@ -5445 +5506 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), cRects, pRects);
 
     return 0;