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

Timestamp:

Jan 15, 2015 11:00:51 AM (10 years ago)

Author:

vboxsync

Message:

Host 3D: prepare for content scaling.

Location:

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

Files:

• server_presenter.h (modified) (2 diffs)
• window.cpp (modified) (5 diffs)

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

@@ -215 +215 @@
         int SetVisibleRegionsChanged();
         int SetCompositor(const struct VBOXVR_SCR_COMPOSITOR * pCompositor);
+        void SetScaleFactor(GLdouble scaleFactor);
+        GLdouble GetScaleFactor();
         int UpdateBegin();
         void UpdateEnd();
@@ -250 +252 @@
         CR_FBWIN_FLAGS mFlags;
         uint64_t mParentId;
+        volatile uint32_t mScaleFactorStorage;
 };
 

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

@@ -28 +28 @@
     mWidth(0),
     mHeight(0),
-    mParentId(parentId)
+    mParentId(parentId),
+    mScaleFactorStorage(1)
 {
     mFlags.Value = 0;
@@ -128 +129 @@
     }
 
-    LOG(("CrWIN: Size [%d ; %d]", width, height));
-
     if (mWidth != width || mHeight != height)
     {
+        GLdouble scaleFactor = GetScaleFactor();
+
         mFlags.fCompositoEntriesModified = 1;
-        mWidth = width;
-        mHeight = height;
+        mWidth  = scaleFactor ? (uint32_t)((GLdouble)width  * scaleFactor) : width;
+        mHeight = scaleFactor ? (uint32_t)((GLdouble)height * scaleFactor) : height;
+
+        LOG(("CrWIN: Size [%d ; %d]", width, height));
+
         if (mSpuWindow)
-            cr_server.head_spu->dispatch_table.WindowSize(mSpuWindow, width, height);
+            cr_server.head_spu->dispatch_table.WindowSize(mSpuWindow, mWidth, mHeight);
     }
 
@@ -193 +197 @@
 
 
+void CrFbWindow::SetScaleFactor(GLdouble scaleFactor)
+{
+    ASMAtomicWriteU32(&mScaleFactorStorage, (uint32_t)scaleFactor);
+}
+
+
+GLdouble CrFbWindow::GetScaleFactor()
+{
+    return (GLdouble)ASMAtomicReadU32(&mScaleFactorStorage);
+}
+
+
 int CrFbWindow::UpdateBegin()
 {
@@ -226 +242 @@
         if (fPresentNeeded || mFlags.fForcePresentOnReenable)
         {
+            GLdouble scaleFactor = GetScaleFactor();
+
             mFlags.fForcePresentOnReenable = false;
             if (mpCompositor)
+            {
+                CrVrScrCompositorSetStretching((VBOXVR_SCR_COMPOSITOR *)mpCompositor, scaleFactor, scaleFactor);
                 cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, mpCompositor, NULL);
+            }
             else
             {
@@ -238 +259 @@
                 Rect.yBottom = mHeight;
                 CrVrScrCompositorInit(&TmpCompositor, &Rect);
+                CrVrScrCompositorSetStretching((VBOXVR_SCR_COMPOSITOR *)&TmpCompositor, scaleFactor, scaleFactor);
                 /* this is a cleanup operation
                  * empty compositor is guarantid to be released on VBoxPresentComposition return */