Changeset 55998 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Timestamp:

May 21, 2015 10:11:10 AM (10 years ago)

Author:

vboxsync

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

100508

Message:

SharedOpenGL: fix crFbBltGetContentsScaledDirect regression

File:

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

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

@@ -196 +196 @@
     PCR_BLITTER pEnteredBlitter = NULL;
 
+    /* Scaled texture size and rect calculated for every new "entered" texture. */
+    uint32_t width = 0, height = 0;
+    RTRECT ScaledSrcRect = {0};
+
     VBOXVR_SCR_COMPOSITOR_CONST_ITERATOR Iter;
     int32_t srcWidth = pSrcRectSize->cx;
@@ -227 +231 @@
         ScaledEntryPoint.x = CR_FLOAT_RCAST(int32_t, strX * CrVrScrCompositorEntryRectGet(pEntry)->xLeft) + pDstRect->xLeft;
         ScaledEntryPoint.y = CR_FLOAT_RCAST(int32_t, strY * CrVrScrCompositorEntryRectGet(pEntry)->yTop) + pDstRect->yTop;
-
-        /* Scaled texture size and rect. */
-        uint32_t width = 0, height = 0;
-        RTRECT ScaledSrcRect = {0};
 
         CR_TEXDATA *pTex = CrVrScrCompositorEntryTexGet(pEntry);