Changeset 54632 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2015 5:23:21 PM (10 years ago)

Author:

vboxsync

Message:

Mac OS X host 3D: unscaled HiDPI: always set viewport according to NSView backing store size.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (2 diffs)

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

@@ -2364 +2364 @@
     VBOXVR_SCR_COMPOSITOR_CONST_ITERATOR CIter;
     const VBOXVR_SCR_COMPOSITOR_ENTRY *pEntry;
-        
+
     CrVrScrCompositorConstIterInit(pCompositor, &CIter);
 
@@ -2370 +2370 @@
 #if defined(VBOX_WITH_CONFIGURABLE_HIDPI_SCALING) && !defined(IN_VMSVGA3D)
     /* Adjust viewport according to current NSView's backing store parameters. */
-    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.;
+
+    NSRect regularBounds = [self bounds];
+    NSRect backingBounds = [self safeConvertRectToBacking:&regularBounds];
+    glViewport(0, 0, backingBounds.size.width, backingBounds.size.height);
+
+    crDebug("HiDPI: vboxPresentToViewCS: up-scaling is %s (backingStretchFactor=%d).",
+        render_spu.fUnscaledHiDPI ? "OFF" : "ON", (int)backingStretchFactor);
 #endif