Changeset 53908 in vbox

Timestamp:

Jan 22, 2015 6:50:14 AM (10 years ago)

Author:

vboxsync

Message:

Host 3D: do not upset GUI when it attempts to set scale factor when 3D output not yet initialized. Cache it and restore once output initialized.

Location:

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

Files:

• server_presenter.cpp (modified) (3 diffs)
• server_presenter.h (modified) (1 diff)

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

@@ -1844 +1844 @@
         {
             bool rc;
+            crDebug("Set scale factor for initialized display.");
             rc = pWin->SetScaleFactor((GLdouble)dScaleFactorW, (GLdouble)dScaleFactorH);
             return rc ? 0 : VERR_LOCK_FAILED;
         }
         else
-            crDebug("Can't set scale factor bacause overlay window obgect not yet created.");
+            crDebug("Can't apply scale factor at the moment bacause overlay window obgect not yet created. Will be chached.");
     }
     else
-        crDebug("Can't set scale factor because specified screen ID cannot be mapped to list of available displays.");
-
-    return VERR_INVALID_PARAMETER;
+        crDebug("Can't apply scale factor at the moment bacause display not yet initialized. Will be chached.");
+
+    /* Display output not yet initialized. Let's cache values. */
+    pDpInfo->dInitialScaleFactorW = dScaleFactorW;
+    pDpInfo->dInitialScaleFactorH = dScaleFactorH;
+
+    return 0;
 }
 
@@ -2106 +2111 @@
         pDpInfo->pDpWin = pDpInfo->pDpWinRootVr;
         pDpInfo->pDpWinRootVr->windowAttach(pDpInfo->pWindow);
+
+        /* Set scale factor once it was previously cached when display output was not yet initialized. */
+        if (pDpInfo->dInitialScaleFactorW || pDpInfo->dInitialScaleFactorH)
+        {
+            crDebug("Set cached scale factor for seamless mode.");
+            pDpInfo->pWindow->SetScaleFactor((GLdouble)pDpInfo->dInitialScaleFactorW, (GLdouble)pDpInfo->dInitialScaleFactorH);
+            /* Invalidate cache. */
+            pDpInfo->dInitialScaleFactorW = pDpInfo->dInitialScaleFactorH = 0;
+        }
     }
 }
@@ -2129 +2143 @@
         pDpInfo->pDpWin = new CrFbDisplayWindow(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID);
         pDpInfo->pDpWin->windowAttach(pDpInfo->pWindow);
+
+        /* Set scale factor once it was previously cached when display output was not yet initialized. */
+        if (pDpInfo->dInitialScaleFactorW || pDpInfo->dInitialScaleFactorH)
+        {
+            crDebug("Set cached scale factor for host window.");
+            pDpInfo->pWindow->SetScaleFactor((GLdouble)pDpInfo->dInitialScaleFactorW, (GLdouble)pDpInfo->dInitialScaleFactorH);
+            /* Invalidate cache. */
+            pDpInfo->dInitialScaleFactorW = pDpInfo->dInitialScaleFactorH = 0;
+        }
     }
 }

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

@@ -401 +401 @@
     uint32_t u32Id;
     int32_t iFb;
+
+    /* Cache scaling factor here before display output
+     * initialized (i.e., guest not yet initiated first 3D call).
+     * No synchronization stuff needed here because all the reads
+     * and writes are done in context of 3D HGCM thread. */
+    double dInitialScaleFactorW;
+    double dInitialScaleFactorH;
 } CR_FBDISPLAY_INFO;