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

Timestamp:

Mar 15, 2013 9:54:00 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/osx: fix visible regions handling

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -668 +668 @@
         {
             uint32_t i;
-            for (i = 0; i < pEntry->cRects; ++i)
+            for (i = 0; i < cRegions; ++i)
             {
                 RTRECT DstRect;

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

@@ -1096 +1096 @@
 - (void)vboxPresentCS
 {
-        NSRect r = [self frame];
-        DEBUG_MSG(("OVIW(%p): rF2V frame: [%i, %i, %i, %i]\n", (void*)self, (int)r.origin.x, (int)r.origin.y, (int)r.size.width, (int)r.size.height));
-
         {
             if ([m_pSharedGLCtx view] != self)
@@ -1122 +1119 @@
 - (void)vboxPresentToViewCS
 {
+    NSRect r = [self frame];
+    DEBUG_MSG(("OVIW(%p): rF2V frame: [%i, %i, %i, %i]\n", (void*)self, (int)r.origin.x, (int)r.origin.y, (int)r.size.width, (int)r.size.height));
+
 #if 1 /* Set to 0 to see the docktile instead of the real output */
     VBOXVR_SCR_COMPOSITOR_ITERATOR CIter;
@@ -1147 +1147 @@
             glReadBuffer(GL_COLOR_ATTACHMENT0);
                     
-            for (i = 0; i < pEntry->cRects; ++i)
+            for (i = 0; i < cRegions; ++i)
             {
                 const RTRECT * pSrcRect = &paSrcRegions[i];
                 const RTRECT * pDstRect = &paDstRegions[i];
+                GLint srcY1 = r.size.height - pSrcRect->yTop;
+                GLint srcY2 = r.size.height - pSrcRect->yBottom;
+                GLint dstY1 = r.size.height - pDstRect->yTop;
+                GLint dstY2 = r.size.height - pDstRect->yBottom;
                        
-                glBlitFramebufferEXT(pSrcRect->xLeft, pSrcRect->yTop + m_RootShift.y,
-                                                                 pSrcRect->xRight, pSrcRect->yBottom + m_RootShift.y,
-                                         pDstRect->xLeft - m_RootShift.x, pDstRect->yTop,
-                                         pDstRect->xRight - m_RootShift.x, pDstRect->yBottom,
+                glBlitFramebufferEXT(pSrcRect->xLeft, srcY1 + m_RootShift.y,
+                                                                 pSrcRect->xRight, srcY2 + m_RootShift.y,
+                                         pDstRect->xLeft - m_RootShift.x, dstY1,
+                                         pDstRect->xRight - m_RootShift.x, dstY2,
                                             GL_COLOR_BUFFER_BIT, GL_LINEAR);
             }
@@ -1282 +1286 @@
                     glReadBuffer(GL_COLOR_ATTACHMENT0);
                     
-                    for (i = 0; i < pEntry->cRects; ++i)
+                    for (i = 0; i < cRegions; ++i)
                     {
                         const RTRECT * pSrcRect = &paSrcRegions[i];
                         const RTRECT * pDstRect = &paDstRegions[i];
+                        GLint srcY1 = r.size.height - pSrcRect->yTop;
+                        GLint srcY2 = r.size.height - pSrcRect->yBottom;
+                        GLint dstY1 = r.size.height - pDstRect->yTop;
+                        GLint dstY2 = r.size.height - pDstRect->yBottom;
+                        
                        
-                        glBlitFramebufferEXT(pSrcRect->xLeft, pSrcRect->yTop + m_RootShift.y, 
-                                                                        pSrcRect->xRight, pSrcRect->yBottom + m_RootShift.y,
-                                                pDstRect->xLeft * m_FBOThumbScaleX, pDstRect->yTop * m_FBOThumbScaleY,
-                                                pDstRect->xRight * m_FBOThumbScaleX, pDstRect->yBottom * m_FBOThumbScaleY,
+                        glBlitFramebufferEXT(pSrcRect->xLeft, srcY1 + m_RootShift.y, 
+                                                                        pSrcRect->xRight, srcY2 + m_RootShift.y,
+                                                pDstRect->xLeft * m_FBOThumbScaleX, dstY1 * m_FBOThumbScaleY,
+                                                pDstRect->xRight * m_FBOThumbScaleX, dstY2 * m_FBOThumbScaleY,
                                                 GL_COLOR_BUFFER_BIT, GL_LINEAR);
                     }