Changeset 50412 in vbox for trunk/src/VBox/GuestHost/OpenGL/include

Timestamp:

Feb 11, 2014 10:21:01 AM (11 years ago)

Author:

vboxsync

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

92180

Message:

crOpenGL: scaling bugfixes; rename stretch -> scale

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• cr_blitter.h (modified) (2 diffs)
• cr_vreg.h (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_blitter.h

@@ -220 +220 @@
     /*dtor*/
     PFNCRTEXDATA_RELEASED pfnTextureReleased;
-    struct CR_TEXDATA *pStretchedCache;
+    struct CR_TEXDATA *pScaledCache;
 } CR_TEXDATA, *PCR_TEXDATA;
 
@@ -281 +281 @@
 VBOXBLITTERDECL(int) CrTdBltDataAcquire(PCR_TEXDATA pTex, GLenum enmFormat, bool fInverted, const CR_BLITTER_IMG**ppImg);
 
-VBOXBLITTERDECL(int) CrTdBltDataAcquireStretched(PCR_TEXDATA pTex, GLenum enmFormat, bool fInverted, uint32_t width, uint32_t height, const CR_BLITTER_IMG**ppImg);
-
-VBOXBLITTERDECL(int) CrTdBltDataReleaseStretched(PCR_TEXDATA pTex, const CR_BLITTER_IMG *pImg);
-
-VBOXBLITTERDECL(void) CrTdBltStretchCacheMoveTo(PCR_TEXDATA pTex, PCR_TEXDATA pDstTex);
+VBOXBLITTERDECL(int) CrTdBltDataAcquireScaled(PCR_TEXDATA pTex, GLenum enmFormat, bool fInverted, uint32_t width, uint32_t height, const CR_BLITTER_IMG**ppImg);
+
+VBOXBLITTERDECL(int) CrTdBltDataReleaseScaled(PCR_TEXDATA pTex, const CR_BLITTER_IMG *pImg);
+
+VBOXBLITTERDECL(void) CrTdBltScaleCacheMoveTo(PCR_TEXDATA pTex, PCR_TEXDATA pDstTex);
 
 /* release the texture data, the data remains cached in the CR_TEXDATA object until it is discarded with CrTdBltDataFree or CrTdBltDataCleanup */

trunk/src/VBox/GuestHost/OpenGL/include/cr_vreg.h

@@ -51 +51 @@
 #define CR_FLOAT_RCAST(_t, _v) ((_t)((float)(_v) + 0.5))
 
-DECLINLINE(void) VBoxRectStretch(PRTRECT pRect, float xStretch, float yStretch)
-{
-    pRect->xLeft = CR_FLOAT_RCAST(int32_t, pRect->xLeft * xStretch);
-    pRect->yTop = CR_FLOAT_RCAST(int32_t, pRect->yTop * yStretch);
-    pRect->xRight = CR_FLOAT_RCAST(int32_t, pRect->xRight * xStretch);
-    pRect->yBottom = CR_FLOAT_RCAST(int32_t, pRect->yBottom * yStretch);
-}
-
-DECLINLINE(void) VBoxRectStretched(const RTRECT *pRect, float xStretch, float yStretch, PRTRECT pResult)
+DECLINLINE(void) VBoxRectScale(PRTRECT pRect, float xScale, float yScale)
+{
+    pRect->xLeft = CR_FLOAT_RCAST(int32_t, pRect->xLeft * xScale);
+    pRect->yTop = CR_FLOAT_RCAST(int32_t, pRect->yTop * yScale);
+    pRect->xRight = CR_FLOAT_RCAST(int32_t, pRect->xRight * xScale);
+    pRect->yBottom = CR_FLOAT_RCAST(int32_t, pRect->yBottom * yScale);
+}
+
+DECLINLINE(void) VBoxRectScaled(const RTRECT *pRect, float xScale, float yScale, PRTRECT pResult)
 {
     *pResult = *pRect;
-    VBoxRectStretch(pResult, xStretch, yStretch);
+    VBoxRectScale(pResult, xScale, yScale);
 }
 #endif