Changeset 57790 in vbox for trunk

Timestamp:

Sep 16, 2015 5:09:28 PM (9 years ago)

Author:

vboxsync

Message:

VMSVGA3d: Turns out I'm blitting to the wrong end (Y direction) of the nsview framebuffer. Missed some [NSOpenGLContext update] calls when the parent view got resized, so it sometimes worked, but not all the time. After calling update, the visible part of the framebuffer is the bottom half, not the top half as I though and as seems to be the case on the other plaforms.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-cocoa.h (modified) (1 diff)
• DevVGA-SVGA3d-cocoa.m (modified) (8 diffs)
• DevVGA-SVGA3d-ogl.cpp (modified) (4 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (1 diff)
• DevVGA-SVGA3d.h (modified) (1 diff)
• VBoxSVGA3DObjC.def (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -535 +535 @@
 #endif
 
+#ifdef IN_RING3
 /**
  * @interface_method_impl{PDMIDISPLAYPORT::pfnSetViewport}
@@ -543 +544 @@
 
     Log(("vmsvgaPortSetViewPort: screen %d (%d,%d)(%d,%d)\n", uScreenId, x, y, cx, cy));
+    VMSVGAVIEWPORT const OldViewport = pThis->svga.viewport;
 
     if (x < pThis->svga.uWidth)
@@ -570 +572 @@
         pThis->svga.viewport.yHighWC = 0;
     }
+
+# ifdef VBOX_WITH_VMSVGA3D
+    /*
+     * Now inform the 3D backend.
+     */
+    if (pThis->svga.f3DEnabled)
+        vmsvga3dUpdateHostScreenViewport(pThis, uScreenId, &OldViewport);
+# endif
 }
+#endif /* IN_RING3 */
 
 /**

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.h

@@ -43 +43 @@
 VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaViewSetPosition(NativeNSViewRef pView, NativeNSViewRef pParentView, int x, int y);
 VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaViewSetSize(NativeNSViewRef pView, int w, int h);
+VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaViewUpdateViewport(NativeNSViewRef pView);
 VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx);
 VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaSwapBuffers(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx);

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m

@@ -118 +118 @@
 - (void)vboxSetPos:(NSPoint)pos;
 - (void)vboxSetSize:(NSSize)size;
+- (void)vboxScheduleCtxUpdate;
 - (void)vboxReshapePerform;
 - (void)vboxReshape;
-#if 0 // doesn't work or isn't needed :/
-- (void)vboxFrameDidChange;
+- (void)vboxBoundsDidChange:(NSNotification *)pNotification;
+- (void)vboxFrameDidChange:(NSNotification *)pNotification;
+- (void)vboxFrameDidChangeGlobal:(NSNotification *)pNotification;
 - (BOOL)postsFrameChangedNotifications;
-#endif
 - (void)vboxRemoveFromSuperviewAndHide;
 - (void)vboxUpdateCtxIfNecessary;
@@ -251 +252 @@
                 [pFmt release];
 
-#if 0 // doesn't work or isn't needed :/
-                /*
-                 * Get notifications when we're moved...
-                 */
-                if (pParams->pParentView)
-                {
-                    [[NSNotificationCenter defaultCenter] addObserver:self
-                                                             selector:@selector(vboxFrameDidChange)
-                                                                 name:NSViewFrameDidChangeNotification
-                                                               object:self];
-                }
-#endif
-
                 LogFlow(("OvlView createViewAndContext: returns successfully\n"));
                 return;
@@ -300 +288 @@
         //self.autoresizingMask = NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin;
         self.autoresizingMask = NSViewNotSizable;
+
+        /*
+         * Get notifications when we're moved or resized and when we're moved 
+         * to a different screen or GPU or when the GL context simply needs updating. 
+         */
+        if (pParentView)
+        {
+            [[NSNotificationCenter defaultCenter] addObserver:self
+                                                     selector:@selector(vboxBoundsDidChange:)
+                                                         name:NSViewBoundsDidChangeNotification
+                                                       object:self];
+            [[NSNotificationCenter defaultCenter] addObserver:self
+                                                     selector:@selector(vboxFrameDidChange:)
+                                                         name:NSViewFrameDidChangeNotification
+                                                       object:self];
+            //[[NSNotificationCenter defaultCenter] addObserver:self
+            //                                         selector:@selector(vboxFrameDidChange:)
+            //                                             name:NSViewDidUpdateTrackingAreasNotification
+            //                                           object:self];
+            [[NSNotificationCenter defaultCenter] addObserver:self
+                                                     selector:@selector(vboxFrameDidChangeGlobal:)
+                                                         name:NSViewGlobalFrameDidChangeNotification
+                                                       object:self];
+        }
     }
     LogFlow(("OvlView(%p) initWithFrameAndFormat: returns %p\n", (void *)self, (void *)self));
@@ -345 +357 @@
 }
 
+- (void)vboxScheduleCtxUpdate
+{
+    m_fUpdateCtx = true;
+}
 
 - (void)vboxUpdateCtxIfNecessary
@@ -454 +470 @@
 }
 
-#if 0 // doesn't work or isn't needed :/
-- (void)vboxFrameDidChange
+/**
+ * This is called when the bounds change.
+ *  
+ * We indicate that the FIFO thread must update the GL context.
+ */
+- (void)vboxBoundsDidChange:(NSNotification *)pNotification
+{
+    LogFlow(("OvlView(%p) vboxBoundsDidChange:\n", (void *)self));
+    self->m_fUpdateCtx = true;
+}
+
+/**
+ * This is called when the frame changes size or position.
+ *  
+ * We indicate that the FIFO thread must update the GL context.
+ */
+- (void)vboxFrameDidChange:(NSNotification *)pNotification
 {
     LogFlow(("OvlView(%p) vboxFrameDidChange:\n", (void *)self));
-}
-
+    self->m_fUpdateCtx = true;
+}
+
+/** 
+ * This is called when moved to different screen/GPU or/and when the GL context 
+ * needs updating.
+ *  
+ * We indicate that the FIFO thread must update the GL context.
+ */
+- (void)vboxFrameDidChangeGlobal:(NSNotification *)pNotification
+{
+    LogFlow(("OvlView(%p) vboxFrameDidChangeGlobal:\n", (void *)self));
+    self->m_fUpdateCtx = true;
+}
+
+/** This enables the vboxFrameDidChange notification. */
 - (BOOL)postsFrameChangedNotifications
 {
@@ -465 +510 @@
     return YES;
 }
-#endif
 
 /**
@@ -493 +537 @@
             LogFlow(("OvlView(%p) vboxRemoveFromSuperviewAndHide: calling setHidden\n", (void *)self));
             [self setHidden:YES];
-#if 0 /* doesn't work, or isn't really needed (scroll bar mess). */
             LogFlow(("OvlView(%p) vboxRemoveFromSuperviewAndHide: calling setHidden\n", (void *)self));
             [[NSNotificationCenter defaultCenter] removeObserver:self];
-#endif
         }
         else
@@ -798 +840 @@
 
 
+VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaViewUpdateViewport(NativeNSViewRef pView)
+{
+    LogFlow(("vmsvga3dCocoaViewSetSize: pView=%p\n", (void *)pView));
+    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
+    VMSVGA3DOverlayView *pOverlayView = (VMSVGA3DOverlayView *)pView;
+
+    /* Possible that we don't actually need to do this (i.e. this API), but right now I'm
+       leaving it to be sure things actually work right when scrolling. */
+    [pOverlayView vboxScheduleCtxUpdate];
+
+    [pPool release];
+    LogFlow(("vmsvga3dCocoaViewSetSize: returns\n"));
+}
+
+
 VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaViewSetSize(NativeNSViewRef pView, int cx, int cy)
 {

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -1078 +1078 @@
 
     return VINF_SUCCESS;
+}
+
+
+void vmsvga3dUpdateHostScreenViewport(PVGASTATE pThis, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport)
+{
+    /** @todo Move the visible framebuffer content here, don't wait for the guest to
+     *        redraw it. */
+
+#ifdef RT_OS_DARWIN
+    PVMSVGA3DSTATE pState = pThis->svga.p3dState;
+    if (   pState
+        && idScreen == 0
+        && pState->SharedCtx.id == VMSVGA3D_SHARED_CTX_ID)
+    {
+        vmsvga3dCocoaViewUpdateViewport(pState->SharedCtx.cocoaView);
+    }
+#else
+    NOREF(pThis); NOREF(idScreen);
+#endif
 }
 
@@ -2995 +3014 @@
          *   => Copy = { .yDst = 2, .ySrc = 5, .cy = 2 }
          *
+         * Update: On darwin, it turns out that when we call [NSOpenGLContext updates]
+         *         when the view is resized, moved and otherwise messed with,
+         *         the visible part of the framebuffer is actually the bottom
+         *         one.  It's easy to adjust for this, just have to adjust the
+         *         destination rectangle such that yBottom is zero.
          */
         /* X - no inversion, so kind of simple. */
@@ -3056 +3080 @@
             {
                 /* adjustment #2 */
-                uint32_t cyAdjust = ClippedRect.y + ClippedRect.h - DstViewport.yHighWC;
+                cyAdjust = ClippedRect.y + ClippedRect.h - DstViewport.yHighWC;
                 ClippedRect.srcy += cyAdjust;
                 ClippedRect.h    -= cyAdjust;
@@ -3079 +3103 @@
         DstRect.xLeft   -= DstViewport.x;
         DstRect.xRight  -= DstViewport.x;
+# ifdef RT_OS_DARWIN /* We actually seeing the bottom of the FB, not the top as on windows and X11. */
+        DstRect.yTop    -= DstRect.yBottom;
+        DstRect.yBottom  = 0;
+# else
         DstRect.yBottom += DstViewport.y;
         DstRect.yTop    += DstViewport.y;
+# endif
 
         Log(("SrcRect: (%d,%d)(%d,%d) DstRect: (%d,%d)(%d,%d)\n",

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -324 +324 @@
 }
 
+void vmsvga3dUpdateHostScreenViewport(PVGASTATE pThis, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport)
+{
+    /** @todo Scroll the screen content without requiring the guest to redraw. */
+    NOREF(pThis); NOREF(idScreen); NOREF(pOldViewport);
+}
 
 static uint32_t vmsvga3dGetSurfaceFormatSupport(PVMSVGA3DSTATE pState3D, uint32_t idx3dCaps, D3DFORMAT format)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h

@@ -56 +56 @@
 int vmsvga3dTerminate(PVGASTATE pThis);
 int vmsvga3dReset(PVGASTATE pThis);
+void vmsvga3dUpdateHostScreenViewport(PVGASTATE pThis, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport);
 int vmsvga3dQueryCaps(PVGASTATE pThis, uint32_t idx3dCaps, uint32_t *pu32Val);
 

trunk/src/VBox/Devices/Graphics/VBoxSVGA3DObjC.def

@@ -24 +24 @@
     vmsvga3dCocoaViewSetPosition
     vmsvga3dCocoaViewSetSize
+    vmsvga3dCocoaViewUpdateViewport
     vmsvga3dCocoaViewMakeCurrentContext
     vmsvga3dCocoaSwapBuffers