Changeset 34739 in vbox for trunk/src

Timestamp:

Dec 6, 2010 11:54:46 AM (14 years ago)

Author:

vboxsync

Message:

Main::Display: use screen id in VBVA mode.

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (9 diffs)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -873 +873 @@
  *  @thread EMT
  */
-void Display::handleDisplayUpdate (int x, int y, int w, int h)
+void Display::handleDisplayUpdateLegacy (int x, int y, int w, int h)
+{
+    unsigned uScreenId = mapCoordsToScreen(maFramebuffers, mcMonitors, &x, &y, &w, &h);
+
+#ifdef DEBUG_sunlover
+    LogFlowFunc (("%d,%d %dx%d (checked)\n", x, y, w, h));
+#endif /* DEBUG_sunlover */
+
+    handleDisplayUpdate (uScreenId, x, y, w, h);
+}
+
+void Display::handleDisplayUpdate (unsigned uScreenId, int x, int y, int w, int h)
 {
 #ifdef VBOX_WITH_OLD_VBVA_LOCK
@@ -883 +894 @@
 
 #ifdef DEBUG_sunlover
-    LogFlowFunc (("%d,%d %dx%d (%d,%d)\n",
-                  x, y, w, h, mpDrv->IConnector.cx, mpDrv->IConnector.cy));
-#endif /* DEBUG_sunlover */
-
-    unsigned uScreenId = mapCoordsToScreen(maFramebuffers, mcMonitors, &x, &y, &w, &h);
-
-#ifdef DEBUG_sunlover
-    LogFlowFunc (("%d,%d %dx%d (checked)\n", x, y, w, h));
+    LogFlowFunc (("[%d] %d,%d %dx%d (%d,%d)\n",
+                  uScreenId, x, y, w, h, mpDrv->IConnector.cx, mpDrv->IConnector.cy));
 #endif /* DEBUG_sunlover */
 
@@ -1143 +1148 @@
         //@todo pfnUpdateDisplayRect must take the vram offset parameter for the framebuffer
         prgn->pPort->pfnUpdateDisplayRect (prgn->pPort, phdr->x, phdr->y, phdr->w, phdr->h);
-        prgn->pDisplay->handleDisplayUpdate (phdr->x + pFBInfo->xOrigin,
+        prgn->pDisplay->handleDisplayUpdateLegacy (phdr->x + pFBInfo->xOrigin,
                                              phdr->y + pFBInfo->yOrigin, phdr->w, phdr->h);
     }
@@ -1161 +1166 @@
         //@todo pfnUpdateDisplayRect must take the vram offset parameter for the framebuffer
         prgn->pPort->pfnUpdateDisplayRect (prgn->pPort, pFBInfo->dirtyRect.xLeft, pFBInfo->dirtyRect.yTop, w, h);
-        prgn->pDisplay->handleDisplayUpdate (pFBInfo->dirtyRect.xLeft + pFBInfo->xOrigin,
+        prgn->pDisplay->handleDisplayUpdateLegacy (pFBInfo->dirtyRect.xLeft + pFBInfo->xOrigin,
                                              pFBInfo->dirtyRect.yTop + pFBInfo->yOrigin, w, h);
     }
@@ -2588 +2593 @@
                 }
 
-                pDisplay->handleDisplayUpdate(x + pFBInfo->xOrigin, y + pFBInfo->yOrigin, width, height);
+                pDisplay->handleDisplayUpdate(aScreenId, x, y, width, height);
             }
         }
@@ -2724 +2729 @@
                 }
 
-                pDisplay->handleDisplayUpdate (pFBInfo->xOrigin, pFBInfo->yOrigin, pFBInfo->w, pFBInfo->h);
+                pDisplay->handleDisplayUpdate (uScreenId, 0, 0, pFBInfo->w, pFBInfo->h);
             }
         }
@@ -3011 +3016 @@
      */
 
-    pDrv->pDisplay->handleDisplayUpdate(x, y, cx, cy);
+    pDrv->pDisplay->handleDisplayUpdate(VBOX_VIDEO_PRIMARY_SCREEN, x, y, cx, cy);
 }
 
@@ -3654 +3659 @@
              */
             pFBInfo->cVBVASkipUpdate = 0;
-            pThis->handleDisplayUpdate(pFBInfo->vbvaSkippedRect.xLeft,
-                                       pFBInfo->vbvaSkippedRect.yTop,
+            pThis->handleDisplayUpdate(uScreenId, pFBInfo->vbvaSkippedRect.xLeft - pFBInfo->xOrigin,
+                                       pFBInfo->vbvaSkippedRect.yTop - pFBInfo->yOrigin,
                                        pFBInfo->vbvaSkippedRect.xRight - pFBInfo->vbvaSkippedRect.xLeft,
                                        pFBInfo->vbvaSkippedRect.yBottom - pFBInfo->vbvaSkippedRect.yTop);
@@ -3753 +3758 @@
     if (RT_LIKELY(pFBInfo->cVBVASkipUpdate == 0))
     {
-        pThis->handleDisplayUpdate(x, y, cx, cy);
+        pThis->handleDisplayUpdate(uScreenId, x - pFBInfo->xOrigin, y - pFBInfo->yOrigin, cx, cy);
     }
     else

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

@@ -123 +123 @@
     // public methods only for internal purposes
     int handleDisplayResize (unsigned uScreenId, uint32_t bpp, void *pvVRAM, uint32_t cbLine, int w, int h);
-    void handleDisplayUpdate (int x, int y, int cx, int cy);
+    void handleDisplayUpdateLegacy (int x, int y, int cx, int cy);
+    void handleDisplayUpdate (unsigned uScreenId, int x, int y, int w, int h);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     void handleVHWACommandProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVHWACMD pCommand);