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

Timestamp:

Jan 16, 2015 8:53:12 AM (10 years ago)

Author:

vboxsync

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

97665

Message:

Host 3D: content scalling: export IDisplay interface and connect it to OpenGL HGCM service.

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (2 diffs)
• crserverlib/presenter/server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -38 +38 @@
 #include <VBox/HostServices/VBoxCrOpenGLSvc.h>
 #include <VBox/vmm/ssm.h>
+#include <VBox/VBoxOGL.h>
 
 #include "cr_mem.h"
@@ -1366 +1367 @@
             break;
         }
+        case SHCRGL_HOST_FN_SET_SCALE_FACTOR:
+        {
+            /* Verify parameter count and types. */
+            if (cParms != 1
+             || paParms[0].type != VBOX_HGCM_SVC_PARM_PTR
+             || paParms[0].u.pointer.size != sizeof(CRVBOXHGCMSETSCALEFACTOR)
+             || !paParms[0].u.pointer.addr)
+            {
+                WARN(("invalid parameter"));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            CRVBOXHGCMSETSCALEFACTOR *pData = (CRVBOXHGCMSETSCALEFACTOR *)paParms[0].u.pointer.addr;
+            double dScaleFactorW = (double)(pData->u32ScaleFactorWMultiplied) / VBOX_OGL_SCALE_FACTOR_MULTIPLIER;
+            double dScaleFactorH = (double)(pData->u32ScaleFactorHMultiplied) / VBOX_OGL_SCALE_FACTOR_MULTIPLIER;
+
+            rc = VBoxOglSetScaleFactor(pData->u32Screen, dScaleFactorW, dScaleFactorH);
+
+            /* Log scaling factor rounded to nearest 'int' value (not so precise). */
+            LogRel(("OpenGL: Set 3D content scale factor to (%u, %u), multiplier %d.\n",
+                pData->u32ScaleFactorWMultiplied,
+                pData->u32ScaleFactorHMultiplied,
+                (int)VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+
+            break;
+        }
         default:
             WARN(("svcHostCallPerform: unexpected u32Function %d", u32Function));

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

@@ -1829 +1829 @@
 }
 
+extern "C" DECLEXPORT(int) VBoxOglSetScaleFactor(uint32_t idScreen, double dScaleFactorW, double dScaleFactorH)
+{
+    if (idScreen >= CR_MAX_GUEST_MONITORS)
+    {
+        WARN(("invalid idScreen %d", idScreen));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
+    if (pDpInfo->pDpWin)
+    {
+        CrFbWindow *pWin = pDpInfo->pDpWin->getWindow();
+        if (pWin)
+        {
+            bool rc;
+            rc = pWin->SetScaleFactor((GLdouble)dScaleFactorW, (GLdouble)dScaleFactorH);
+            return rc ? 0 : VERR_LOCK_FAILED;
+        }
+    }
+
+    return VERR_INVALID_PARAMETER;
+}
+
 int CrPMgrScreenChanged(uint32_t idScreen)
 {