Changeset 54582 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2015 3:42:16 PM (10 years ago)

Author:

vboxsync

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

98721

Message:

Host 3D unscaled HiDPI output: privide notifyHiDPIOutputPolicyChange() IDisplay interface to GUI in ouder to notify 3D about corresponding user option value change.

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu.c (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu.h (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/DisplayImpl.h (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -561 +561 @@
 extern DECLEXPORT(void) crVBoxServerCalloutEnable(VBOXCRCMDCTL *pCtl);
 extern DECLEXPORT(void) crVBoxServerCalloutDisable();
+extern DECLEXPORT(void) crServerSetUnscaledHiDPI(bool fEnable);
 
 #ifdef VBOX_WITH_CRHGSMI

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

@@ -1395 +1395 @@
             break;
         }
+
+        case SHCRGL_HOST_FN_SET_UNSCALED_HIDPI:
+        {
+            /* Verify parameter count and types. */
+            if (cParms != 1
+             || paParms[0].type != VBOX_HGCM_SVC_PARM_PTR
+             || paParms[0].u.pointer.size != sizeof(CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT)
+             || !paParms[0].u.pointer.addr)
+            {
+                WARN(("invalid parameter"));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT *pData = (CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT *)paParms[0].u.pointer.addr;
+            crServerSetUnscaledHiDPI(pData->fUnscaledHiDPI);
+            LogRel(("OpenGL: Set OpenGL scale policy on HiDPI displays (fUnscaledHiDPI=%d).\n", pData->fUnscaledHiDPI));
+            break;
+        }
+
         default:
             WARN(("svcHostCallPerform: unexpected u32Function %d", u32Function));

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -2541 +2541 @@
 }
 
+DECLEXPORT(void) crServerSetUnscaledHiDPI(bool fEnable)
+{
+    renderspuSetUnscaledHiDPI(fEnable);
+}
+
 static void crVBoxServerReparentMuralCB(unsigned long key, void *data1, void *data2)
 {

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -1868 +1868 @@
 }
 
+DECLEXPORT(void) renderspuSetUnscaledHiDPI(bool fEnable)
+{
+    render_spu.fUnscaledHiDPI = fEnable;
+}
+
 #define FILLIN( NAME, FUNC ) \
   table[i].name = crStrdup(NAME); \

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -348 +348 @@
 # endif
 #endif /* RT_OS_DARWIN */
+    /* If TRUE, render should tell window server to prevent artificial content
+     * up-scaling when displayed on HiDPI monitor. */
+    bool fUnscaledHiDPI;
 } RenderSPU;
 
@@ -495 +498 @@
 DECLEXPORT(void) renderspuSetWindowId(uint64_t winId);
 DECLEXPORT(void) renderspuReparentWindow(GLint window);
+DECLEXPORT(void) renderspuSetUnscaledHiDPI(bool fEnable);
 #ifdef __cplusplus
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -1429 +1429 @@
     
     self = [super initWithFrame:frame];
-#ifdef VBOX_WITH_CONFIGURABLE_HIDPI_SCALING
-    [self performSelector:@selector(setWantsBestResolutionOpenGLSurface:) withObject: (id)YES];
+#if defined(VBOX_WITH_CONFIGURABLE_HIDPI_SCALING) && !defined(IN_VMSVGA3D)
+    crDebug("HiDPI: up-scaling is %s on NSView init.", render_spu.fUnscaledHiDPI ? "OFF" : "ON");
+    if (render_spu.fUnscaledHiDPI)
+        [self performSelector:@selector(setWantsBestResolutionOpenGLSurface:) withObject: (id)YES];
 #endif
 
@@ -2366 +2368 @@
 
     float backingStretchFactor = 1.;
-#ifdef VBOX_WITH_CONFIGURABLE_HIDPI_SCALING
+#if defined(VBOX_WITH_CONFIGURABLE_HIDPI_SCALING) && !defined(IN_VMSVGA3D)
     /* Adjust viewport according to current NSView's backing store parameters. */
-    NSRect regularBounds = [self bounds];
-    NSRect backingBounds = [self safeConvertRectToBacking:&regularBounds];
-    glViewport(0, 0, backingBounds.size.width, backingBounds.size.height);
-
-    /* Update strech factor in order to satisfy current NSView's backing store parameters. */
-    backingStretchFactor = [self safeGetBackingScaleFactor];
+    crDebug("HiDPI: vboxPresentToViewCS: up-scaling is %s.", render_spu.fUnscaledHiDPI ? "OFF" : "ON");
+    if (render_spu.fUnscaledHiDPI)
+    {
+        NSRect regularBounds = [self bounds];
+        NSRect backingBounds = [self safeConvertRectToBacking:&regularBounds];
+        glViewport(0, 0, backingBounds.size.width, backingBounds.size.height);
+
+        /* Update stretch factor in order to satisfy current NSView's backing store parameters. */
+        backingStretchFactor = [self safeGetBackingScaleFactor];
+    }
+    else
+        backingStretchFactor = 1.;
 #endif
 

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

@@ -15795 +15795 @@
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="772FBD91-65B5-4CFB-814C-E40E61AC7070"
+    uuid="04AA5E91-3816-4990-8C52-59939307E5EF"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IEventListener"
@@ -16104 +16104 @@
       <param name="u32ScaleFactorWMultiplied" type="unsigned long" dir="in"/>
       <param name="u32ScaleFactorHMultiplied" type="unsigned long" dir="in"/>
+    </method>
+
+    <method name="notifyHiDPIOutputPolicyChange">
+      <desc>
+         Notify OpenGL HGCM host service about HiDPI monitor scaling policy change.
+      </desc>
+      <param name="fUnscaledHiDPI" type="boolean" dir="in"/>
     </method>
 

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

@@ -267 +267 @@
                                             ULONG aScaleFactorWMultiplied,
                                             ULONG aScaleFactorHMultiplied);
+    virtual HRESULT notifyHiDPIOutputPolicyChange(BOOL fUnscaledHiDPI);
 
     // Wrapped IEventListener properties

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

@@ -3565 +3565 @@
 #else
     AssertMsgFailed(("Attempt to specify OpenGL content scale factor while corresponding functionality is disabled."));
+    return E_UNEXPECTED;
+#endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */
+}
+
+HRESULT Display::notifyHiDPIOutputPolicyChange(BOOL fUnscaledHiDPI)
+{
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+    HRESULT hr = E_UNEXPECTED;
+
+    /* 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(CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT) + sizeof(VBOXCRCMDCTL_HGCM));
+                if (pCtl)
+                {
+                    CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT *pData = (CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT *)(pCtl + 1);
+                    int rc;
+
+                    pData->fUnscaledHiDPI          = fUnscaledHiDPI;
+
+                    pCtl->Hdr.enmType              = VBOXCRCMDCTL_TYPE_HGCM;
+                    pCtl->Hdr.u32Function          = SHCRGL_HOST_FN_SET_UNSCALED_HIDPI;
+                    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_crCtlSubmitSync(&pCtl->Hdr, sizeof(*pCtl));
+                    if (RT_FAILURE(rc))
+                        AssertMsgFailed(("crCtlSubmitSync failed (rc=%Rrc)\n", rc));
+                    else
+                        hr = S_OK;
+
+                    RTMemFree(pCtl);
+                }
+                else
+                {
+                    LogRel(("Running out of memory on attempt to notify OpenGL about HiDPI output scaling policy change. Ignored.\n"));
+                    hr = E_OUTOFMEMORY;
+                }
+            }
+            else
+                LogRel(("Internal error occurred on attempt to notify OpenGL about HiDPI output scaling policy change. Ignored.\n"));
+        }
+        else
+            LogRel(("Attempt to notify OpenGL about HiDPI output scaling policy change while corresponding HGCM host service not yet runing. Ignored.\n"));
+    }
+    else
+    {
+        hr = S_OK;
+        /* Need an interface like this here (and the #ifdefs needs adjusting):
+        PPDMIDISPLAYPORT pUpPort = mpDrv ? mpDrv->pUpPort : NULL;
+        if (pUpPort && pUpPort->pfnSetScaleFactor)
+            pUpPort->pfnSetScaleFactor(pUpPort, aScreeId, aScaleFactorWMultiplied, aScaleFactorHMultiplied); */
+    }
+
+    return hr;
+#else
+    AssertMsgFailed(("Attempt to notify OpenGL about HiDPI output scaling policy change while corresponding functionality is disabled."));
     return E_UNEXPECTED;
 #endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */