Changeset 51147 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Apr 25, 2014 3:40:21 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: more blit fixes, reenable cmdvbva

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_config.c (modified) (2 diffs)
• server_presenter.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

@@ -231 +231 @@
     {
         cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT
-//                | CR_VBOX_CAP_CMDVBVA
+                | CR_VBOX_CAP_CMDVBVA
                 | CR_VBOX_CAP_CMDBLOCKS
                 ;
@@ -381 +381 @@
     {
         cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT
-//                | CR_VBOX_CAP_CMDVBVA
+                | CR_VBOX_CAP_CMDVBVA
                 | CR_VBOX_CAP_CMDBLOCKS
                 ;

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

@@ -558 +558 @@
 }
 
-int CrFbBltGetContents(HCR_FRAMEBUFFER hFb, const RTPOINT *pPos, uint32_t cRects, const RTRECT *pRects, CR_BLITTER_IMG *pImg)
+int CrFbBltGetContents(HCR_FRAMEBUFFER hFb, const RTPOINT *pPos, uint32_t cRects, const RTRECT *pRects, CR_BLITTER_IMG *pDst)
 {
     VBOXVR_LIST List;
@@ -676 +676 @@
                 bool fInvert = !(CrVrScrCompositorEntryFlagsGet(pEntry) & CRBLT_F_INVERT_SRC_YCOORDS);
 
-                CrMBltImgRect(pSrcImg, &EntryPoint, fInvert, &Intersection, pImg);
+                CrMBltImgRect(pSrcImg, &EntryPoint, fInvert, &Intersection, pDst);
 
                 CrTdBltDataRelease(pTex);
@@ -717 +717 @@
         crFbImgFromFb(hFb, &FbImg);
 
-        CrMBltImg(&FbImg, pPos, c2DRects, p2DRects, pImg);
+        CrMBltImg(&FbImg, pPos, c2DRects, p2DRects, pDst);
     }
 
@@ -752 +752 @@
 }
 
-static void crFbBltPutContentsFbVram(HCR_FRAMEBUFFER hFb, const RTPOINT *pPos, uint32_t cRects, const RTRECT *pRects, CR_BLITTER_IMG *pImg)
+static void crFbBltPutContentsFbVram(HCR_FRAMEBUFFER hFb, const RTPOINT *pPos, uint32_t cRects, const RTRECT *pRects, CR_BLITTER_IMG *pSrc)
 {
     const RTRECT *pCompRect = CrVrScrCompositorRectGet(&hFb->Compositor);
@@ -760 +760 @@
     crFbImgFromFb(hFb, &FbImg);
 
-    CrMBltImg(&FbImg, pPos, cRects, pRects, pImg);
+    CrMBltImg(pSrc, pPos, cRects, pRects, &FbImg);
 }