Changeset 54582 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

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

Author:

vboxsync

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/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu.h (modified) (2 diffs)
• renderspu_cocoa_helper.m (modified) (2 diffs)

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