Changeset 51101 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Apr 17, 2014 8:36:20 PM (11 years ago)

Author:

vboxsync

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

93381

Message:

DevVGA/CrCmd: multimon support fix (some more to follow)

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (6 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -4772 +4772 @@
 }
 
-static void crVBoxServerCrCmdBltPrimaryUpdate(const RTRECT *pRects, uint32_t cRects, uint32_t u32PrimaryID)
+static void crVBoxServerCrCmdBltPrimaryUpdate(const VBVAINFOSCREEN *pScreen, const RTRECT *pRects, uint32_t cRects, uint32_t u32PrimaryID)
 {
     if (!cRects)
@@ -4827 +4827 @@
     if (dirtyRect.xRight - dirtyRect.xLeft)
     {
-        cr_server.CrCmdClientInfo.pfnCltScrUpdateEnd(cr_server.CrCmdClientInfo.hCltScr, u32PrimaryID, dirtyRect.xLeft, dirtyRect.yTop,
+        cr_server.CrCmdClientInfo.pfnCltScrUpdateEnd(cr_server.CrCmdClientInfo.hCltScr, u32PrimaryID, pScreen->i32OriginX + dirtyRect.xLeft, pScreen->i32OriginY + dirtyRect.yTop,
                                            dirtyRect.xRight - dirtyRect.xLeft, dirtyRect.yBottom - dirtyRect.yTop);
     }
@@ -4937 +4937 @@
 
         crServerDispatchVBoxTexPresent(texId, u32PrimaryID, pCmd->Hdr.Pos.x, pCmd->Hdr.Pos.y, cRects, (const GLint*)pRects);
+
+        return 0;
     }
     else
@@ -4956 +4958 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
 
     return 0;
@@ -5107 +5109 @@
 
         crServerDispatchVBoxTexPresent(texId, u32PrimaryID, pCmd->Hdr.Pos.x, pCmd->Hdr.Pos.y, cRects, (const GLint*)pRects);
+
+        return 0;
     }
     else
@@ -5137 +5141 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
 
     return 0;