Changeset 53847 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/VBox/HostServices/VBoxCrOpenGLSvc.h (modified) (2 diffs)
• include/VBox/VBoxOGL.h (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/DisplayImpl.h (modified) (2 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

@@ -51 +51 @@
 #define SHCRGL_HOST_FN_WINDOWS_SHOW (25)
 #define SHCRGL_HOST_FN_CTL          (26)
+#define SHCRGL_HOST_FN_SET_SCALE_FACTOR (27)
+
 /* crOpenGL guest functions */
 #define SHCRGL_GUEST_FN_WRITE       (2)
@@ -410 +412 @@
 } CRVBOXHGCMTAKESCREENSHOT;
 
+typedef struct
+{
+    uint32_t u32Screen;
+    uint32_t u32ScaleFactorWMultiplied;
+    uint32_t u32ScaleFactorHMultiplied;
+} CRVBOXHGCMSETSCALEFACTOR;
+
 #endif

trunk/include/VBox/VBoxOGL.h

@@ -27 +27 @@
 
 #include <iprt/cdefs.h>
+#include <iprt/types.h>
 
 RT_C_DECLS_BEGIN
+
+/* GUI and VBox OpenGL code require scaling factor value to be stored in container
+ * of type of 'double'. Communication between them is done via Main. In the same time,
+ * currently, Main does not like type of 'double' to be used for an interface method parameter.
+ * An integer type should be used instead. This value is used in order to specify scaling factor in type
+ * of 'integer' units. It is assumed that GUI feeds Main with its internal scaling factor value
+ * (which is originally of type of 'double') multiplied by this constant and converted resulting
+ * value to type of 'uint32_t'. Then Main provides this data to OpenGL HGCM thread. Finally, VBox OpenGL
+ * code divides received scalar by this constant and converts result to type of 'double'.
+ * This constant can be increased (multiplied by 10^n) in order to get better precision
+ * for scaling factor manipulations. */
+#define VBOX_OGL_SCALE_FACTOR_MULTIPLIER    100.0
 
 bool RTCALL VBoxOglIsOfflineRenderingAppropriate(void);
 bool RTCALL VBoxOglIs3DAccelerationSupported(void);
 
+DECLEXPORT(int) VBoxOglSetScaleFactor(uint32_t idScreen, double dScaleFactorW, double dScaleFactorH);
+
 RT_C_DECLS_END
 

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)
 {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -15812 +15812 @@
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="dc19253d-e6b8-4b2c-8923-c8ecf80d1909"
+    uuid="772FBD91-65B5-4CFB-814C-E40E61AC7070"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IEventListener"
@@ -16112 +16112 @@
       <param name="screenId" type="unsigned long" dir="in"/>
       <param name="displaySourceBitmap" type="IDisplaySourceBitmap" dir="out"/>
+    </method>
+
+    <method name="notifyScaleFactorChange">
+      <desc>
+         Obtains the guest screen bitmap parameters.
+      </desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
+      <param name="u32ScaleFactorWMultiplied" type="unsigned long" dir="in"/>
+      <param name="u32ScaleFactorHMultiplied" type="unsigned long" dir="in"/>
     </method>
 

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -170 +170 @@
     void i_handleCrVRecScreenshotEnd(uint32_t uScreen, uint64_t u64TimeStamp);
     void i_handleVRecCompletion();
+    HRESULT notifyScaleFactorChange(uint32_t uScreen, uint32_t u32ScaleFactorWMultiplied, uint32_t u32ScaleFactorHMultiplied);
 #endif
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -3398 +3398 @@
     Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED);
     ASMAtomicWriteU32(&mfCrOglVideoRecState, CRVREC_STATE_IDLE);
+}
+
+HRESULT Display::notifyScaleFactorChange(uint32_t uScreen, uint32_t u32ScaleFactorWMultiplied, uint32_t u32ScaleFactorHMultiplied)
+{
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+    HRESULT hr = E_UNEXPECTED;
+
+    if (uScreen >= mcMonitors)
+        return E_INVALIDARG;
+
+    /* 3D acceleration enabled in VM config. */
+    if (mfIsCr3DEnabled)
+    {
+        /* VBoxSharedCrOpenGL HGCM host service is running. */
+        if (mhCrOglSvc)
+        {
+            VMMDev *pVMMDev = mParent->i_getVMMDev();
+            if (pVMMDev)
+            {
+                VBOXCRCMDCTL_HGCM *pCtl;
+                pCtl = (VBOXCRCMDCTL_HGCM *)RTMemAlloc(sizeof(CRVBOXHGCMSETSCALEFACTOR) + sizeof(VBOXCRCMDCTL_HGCM));
+                if (pCtl)
+                {
+                    CRVBOXHGCMSETSCALEFACTOR *pData = (CRVBOXHGCMSETSCALEFACTOR *)(pCtl + 1);
+                    int rc;
+
+                    pData->u32Screen                 = uScreen;
+                    pData->u32ScaleFactorWMultiplied = u32ScaleFactorWMultiplied;
+                    pData->u32ScaleFactorHMultiplied = u32ScaleFactorHMultiplied;
+
+                    pCtl->Hdr.enmType              = VBOXCRCMDCTL_TYPE_HGCM;
+                    pCtl->Hdr.u32Function          = SHCRGL_HOST_FN_SET_SCALE_FACTOR;
+                    pCtl->aParms[0].type           = VBOX_HGCM_SVC_PARM_PTR;
+                    pCtl->aParms[0].u.pointer.addr = pData;
+                    pCtl->aParms[0].u.pointer.size = sizeof(*pData);
+
+                    rc = i_crCtlSubmit(&pCtl->Hdr, sizeof(*pCtl), i_displayCrCmdFree, pCtl);
+                    if (RT_FAILURE(rc))
+                    {
+                        AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
+                        RTMemFree(pCtl);
+                    }
+                    else
+                        hr = S_OK;
+                }
+                else
+                {
+                    Log(("Running out of memory on attempt to set OpenGL content scale factor. Ignored.\n"));
+                    hr = E_OUTOFMEMORY;
+                }
+            }
+            else
+                Log(("Internal error occurred on attempt to set OpenGL content scale factor. Ignored.\n"));
+        }
+        else
+            Log(("Attempt to specify OpenGL content scale factor while corresponding HGCM host service not yet runing. Ignored.\n"));
+    }
+    else
+        Log(("Attempt to specify OpenGL content scale factor while 3D acceleration is disabled in VM config. Ignored.\n"));
+
+    return hr;
+#else
+    Log(("Attempt to specify OpenGL content scale factor while corresponding functionality is disabled."));
+    return E_UNEXPECTED;
+#endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */
 }