Changeset 53858 in vbox

Timestamp:

Jan 19, 2015 9:56:10 AM (10 years ago)

Author:

vboxsync

Message:

3D content scaling: keep window size parameters unchanged (not multiplied by scaling factor); update window geometry once scaling factor updated (fixes visual artifacts when Win guest login screen displayed).

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Files:

• server_presenter.cpp (modified) (1 diff)
• server_presenter.h (modified) (1 diff)
• window.cpp (modified) (8 diffs)

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

@@ -1845 +1845 @@
             bool rc;
             rc = pWin->SetScaleFactor((GLdouble)dScaleFactorW, (GLdouble)dScaleFactorH);
-
-            /* Sync framebuffer with scaling factor changes. */
-            HCR_FRAMEBUFFER pFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
-            if (pFb && pFb->pDisplay)
-                pFb->pDisplay->FramebufferChanged(pFb);
-
             return rc ? 0 : VERR_LOCK_FAILED;
         }

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

@@ -211 +211 @@
         int Reparent(uint64_t parentId);
         int SetVisible(bool fVisible);
-        int SetSize(uint32_t width, uint32_t height);
+        int SetSize(uint32_t width, uint32_t height, bool fForced=false);
         int SetPosition(int32_t x, int32_t y);
         int SetVisibleRegionsChanged();

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

@@ -128 +128 @@
 
 
-int CrFbWindow::SetSize(uint32_t width, uint32_t height)
-{
-    if (!checkInitedUpdating())
-    {
-        WARN(("err"));
-        return VERR_INVALID_STATE;
-    }
-
-    if (mWidth != width || mHeight != height)
+int CrFbWindow::SetSize(uint32_t width, uint32_t height, bool fForced)
+{
+    if (!checkInitedUpdating() && !fForced)
+    {
+        crDebug("CrFbWindow: SetSize request dropped because window is currently updating"
+                "(width=%d, height=%d, mWidth=%d, mHeight=%d).", width, height, mWidth, mHeight);
+        return VERR_INVALID_STATE;
+    }
+
+    if (mWidth != width || mHeight != height || fForced)
     {
         GLdouble scaleFactorW, scaleFactorH;
+        uint32_t scaledWidth, scaledHeight;
 
         /* Reset to default values if operation was unsuccessfull. */
@@ -145 +147 @@
 
         mFlags.fCompositoEntriesModified = 1;
-        mWidth  = scaleFactorW ? (uint32_t)((GLdouble)width  * scaleFactorW) : width;
-        mHeight = scaleFactorH ? (uint32_t)((GLdouble)height * scaleFactorH) : height;
-
-        LOG(("CrWIN: Size [%d ; %d]", width, height));
+
+        /* Keep mWidth and mHeight unchanged (not multiplied by scale factor scalar). */
+        mWidth  = width;
+        mHeight = height;
+
+        scaledWidth  = (uint32_t)((GLdouble)width  * scaleFactorW);
+        scaledHeight = (uint32_t)((GLdouble)height * scaleFactorH);
 
         if (mSpuWindow)
-            cr_server.head_spu->dispatch_table.WindowSize(mSpuWindow, mWidth, mHeight);
-    }
+        {
+            cr_server.head_spu->dispatch_table.WindowSize(mSpuWindow, scaledWidth, scaledHeight);
+            crDebug("CrFbWindow: SetSize request performed successfully "
+                    "(width=%d, height=%d, scaledWidth=%d, scaledHeight=%d).", width, height, scaledWidth, scaledHeight);
+        }
+        else
+            crDebug("CrFbWindow: SetSize request skipped because mSpuWindow not yet constructed "
+                    "(width=%d, height=%d, scaledWidth=%d, scaledHeight=%d).", width, height, scaledWidth, scaledHeight);
+    }
+    else
+        crDebug("CrFbWindow: SetSize request skipped because window arleady has requested size "
+                "(width=%d, height=%d, mWidth=%d, mHeight=%d).", width, height, mWidth, mHeight);
 
     return VINF_SUCCESS;
@@ -162 +177 @@
     if (!checkInitedUpdating())
     {
-        WARN(("err"));
+        crDebug("CrFbWindow: SetPosition request dropped because window is currently updating (x=%d, y=%d).", x, y);
         return VERR_INVALID_STATE;
     }
@@ -174 +189 @@
         if (mSpuWindow)
             cr_server.head_spu->dispatch_table.WindowPosition(mSpuWindow, x, y);
+        crDebug("CrFbWindow: SetPosition performed successfully (x=%d, y=%d).", x, y);
     }
 
@@ -215 +231 @@
     if ( !(  (scaleFactorW >= VBOX_OGL_SCALE_FACTOR_MIN && scaleFactorW <= VBOX_OGL_SCALE_FACTOR_MAX)
           && (scaleFactorH >= VBOX_OGL_SCALE_FACTOR_MIN && scaleFactorH <= VBOX_OGL_SCALE_FACTOR_MAX)))
+    {
+        crDebug("CrFbWindow: attempt to set scale factor out of valid values range: scaleFactorW=%d, scaleFactorH=%d, multiplier=%d.",
+            (int)(scaleFactorW * VBOX_OGL_SCALE_FACTOR_MULTIPLIER), (int)(scaleFactorH * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+            (int)VBOX_OGL_SCALE_FACTOR_MULTIPLIER);
+
         return false;
+    }
 
     rc = RTSemRWRequestWrite(scaleFactorLock, RT_INDEFINITE_WAIT);
@@ -223 +245 @@
         mScaleFactorHStorage = scaleFactorH;
         RTSemRWReleaseWrite(scaleFactorLock);
+
+        crDebug("CrFbWindow: set scale factor: scaleFactorW=%d, scaleFactorH=%d, multiplier=%d.",
+            (int)(scaleFactorW * VBOX_OGL_SCALE_FACTOR_MULTIPLIER), (int)(scaleFactorH * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+            (int)VBOX_OGL_SCALE_FACTOR_MULTIPLIER);
+
+        /* Update window geometry. Do not wait for GAs to send SetSize() and SetPosition()
+         * events since they might not be running or installed at all. */
+        SetSize(mWidth, mHeight, true);
+        SetPosition(mxPos, myPos);
+
         return true;
     }
+
+    crDebug("CrFbWindow: unable to set scale factor because RW lock cannot be aquired: scaleFactorW=%d, scaleFactorH=%d, multiplier=%d.",
+            (int)(scaleFactorW * VBOX_OGL_SCALE_FACTOR_MULTIPLIER), (int)(scaleFactorH * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+            (int)VBOX_OGL_SCALE_FACTOR_MULTIPLIER);
 
     return false;
@@ -295 +331 @@
                 VBOXVR_SCR_COMPOSITOR TmpCompositor;
                 RTRECT Rect;
-                Rect.xLeft = 0;
-                Rect.yTop = 0;
-                Rect.xRight = mWidth;
-                Rect.yBottom = mHeight;
+                Rect.xLeft   = 0;
+                Rect.yTop    = 0;
+                Rect.xRight  = (uint32_t)((GLdouble)mWidth  * scaleFactorW);
+                Rect.yBottom = (uint32_t)((GLdouble)mHeight * scaleFactorH);
                 CrVrScrCompositorInit(&TmpCompositor, &Rect);
                 CrVrScrCompositorSetStretching((VBOXVR_SCR_COMPOSITOR *)&TmpCompositor, scaleFactorW, scaleFactorH);
@@ -343 +379 @@
     }
 
-    cr_server.head_spu->dispatch_table.WindowSize(mSpuWindow, mWidth, mHeight);
+    GLdouble scaleFactorW, scaleFactorH;
+    /* Reset to default values if operation was unseccessfull. */
+    if (!GetScaleFactor(&scaleFactorW, &scaleFactorH))
+        scaleFactorW = scaleFactorH = 1.0;
+
+    uint32_t scaledWidth, scaledHeight;
+
+    scaledWidth  = (uint32_t)((GLdouble)mWidth  * scaleFactorW);
+    scaledHeight = (uint32_t)((GLdouble)mHeight * scaleFactorH);
+
+    cr_server.head_spu->dispatch_table.WindowSize(mSpuWindow, scaledWidth, scaledHeight);
     cr_server.head_spu->dispatch_table.WindowPosition(mSpuWindow, mxPos, myPos);