Changeset 44972 in vbox for trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

Timestamp:

Mar 11, 2013 11:01:17 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix glDrawXxx-based blitting

File:

• trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp (modified) (9 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -104 +104 @@
 DECLINLINE(GLfloat*) crBltVtRectTFNormalized(const RTRECT *pRect, uint32_t normalX, uint32_t normalY, GLfloat* pBuff)
 {
+    /* going ccw:
+     * 1. (left;top)        4. (right;top)
+     *        |                    ^
+     *        >                    |
+     * 2. (left;bottom)  -> 3. (right;bottom) */
     /* xLeft yTop */
     pBuff[0] = ((float)pRect->xLeft)/((float)normalX);
@@ -159 +164 @@
 
 /* Indexed GL_TRIANGLES */
-DECLINLINE(GLfloat*) crBltVtRectITNormalized(const RTRECT *pRect, uint32_t normalX, uint32_t normalY, GLfloat* pBuff, GLubyte **ppIndex, GLubyte *piBase)
+DECLINLINE(GLfloat*) crBltVtRectITNormalized(const RTRECT *pRect, uint32_t normalX, uint32_t normalY, GLfloat* pBuff)
 {
     GLfloat* ret = crBltVtRectTFNormalized(pRect, normalX, normalY, pBuff);
+    return ret;
+}
+
+DECLINLINE(GLint*) crBltVtRectIT(RTRECT *pRect, uint32_t normalX, uint32_t normalY, GLint* pBuff, GLubyte **ppIndex, GLubyte *piBase)
+{
+    GLint* ret = crBltVtRectTF(pRect, normalX, normalY, pBuff);
 
     if (ppIndex)
@@ -169 +180 @@
 }
 
-DECLINLINE(GLint*) crBltVtRectIT(RTRECT *pRect, uint32_t normalX, uint32_t normalY, GLint* pBuff, GLubyte **ppIndex, GLubyte *piBase)
-{
-    GLint* ret = crBltVtRectTF(pRect, normalX, normalY, pBuff);
+DECLINLINE(GLuint) crBltVtGetNumVerticiesTF(GLuint cRects)
+{
+    return cRects * 4;
+}
+
+#define crBltVtGetNumVerticiesIT crBltVtGetNumVerticiesTF
+
+DECLINLINE(GLuint) crBltVtGetNumIndiciesIT(GLuint cRects)
+{
+    return 6 * cRects;
+}
+
+
+static GLfloat* crBltVtRectsITNormalized(const RTRECT *paRects, uint32_t cRects, uint32_t normalX, uint32_t normalY, GLfloat* pBuff, GLubyte **ppIndex, GLubyte *piBase)
+{
+    uint32_t i;
+    for (i = 0; i < cRects; ++i)
+    {
+        pBuff = crBltVtRectITNormalized(&paRects[i], normalX, normalY, pBuff);
+    }
+
 
     if (ppIndex)
-        *ppIndex = crBltVtFillRectIndicies(*ppIndex, piBase);
-
-    return ret;
-}
-
-DECLINLINE(GLuint) crBltVtGetNumVerticiesTF(GLuint cRects)
-{
-    return cRects * 4;
-}
-
-#define crBltVtGetNumVerticiesIT crBltVtGetNumVerticiesTF
-
-DECLINLINE(GLuint) crBltVtGetNumIndiciesIT(GLuint cRects)
-{
-    return 6 * cRects;
-}
-
-
-static GLfloat* crBltVtRectsITNormalized(const RTRECT *paRects, uint32_t cRects, uint32_t normalX, uint32_t normalY, GLfloat* pBuff, GLubyte **ppIndex, GLubyte *piBase)
-{
-    for (uint32_t i = 0; i < cRects; ++i)
-    {
-        pBuff = crBltVtRectITNormalized(&paRects[i], normalX, normalY, pBuff, ppIndex, piBase);
-    }
+    {
+        GLubyte *pIndex = (GLubyte*)pBuff;
+        *ppIndex = pIndex;
+        for (i = 0; i < cRects; ++i)
+        {
+            pIndex = crBltVtFillRectIndicies(pIndex, piBase);
+        }
+        pBuff = (GLfloat*)pIndex;
+    }
+
     return pBuff;
 }
@@ -310 +325 @@
         {
             pVerticies = (GLfloat*)crBltBufGet(&pBlitter->Verticies, cElements * 2 * 2 * sizeof (*pVerticies));
-            pTexCoords = crBltVtRectTFNormalized(paDstRect, normalX, normalY, pVerticies);
+            pTexCoords = crBltVtRectTFNormalized(paDstRect, 1, 1, pVerticies);
             crBltVtRectTFNormalized(paSrcRect, normalX, normalY, pTexCoords);
         }
@@ -318 +333 @@
 
         pBlitter->pDispatch->EnableClientState(GL_TEXTURE_COORD_ARRAY);
-        pBlitter->pDispatch->VertexPointer(2, GL_FLOAT, 0, pTexCoords);
+        pBlitter->pDispatch->TexCoordPointer(2, GL_FLOAT, 0, pTexCoords);
 
         pBlitter->pDispatch->Enable(pSrc->target);
@@ -347 +362 @@
         {
             pVerticies = (GLfloat*)crBltBufGet(&pBlitter->Verticies, cElements * 2 * 2 * sizeof (*pVerticies));
-            pTexCoords = crBltVtRectsITNormalized(paDstRect, cRects, normalX, normalY, pVerticies, &pIndicies, &iIdxBase);
+            pTexCoords = crBltVtRectsITNormalized(paDstRect, cRects, 1, 1, pVerticies, &pIndicies, &iIdxBase);
             crBltVtRectsITNormalized(paSrcRect, cRects, normalX, normalY, pTexCoords, NULL, NULL);
         }
@@ -355 +370 @@
 
         pBlitter->pDispatch->EnableClientState(GL_TEXTURE_COORD_ARRAY);
-        pBlitter->pDispatch->VertexPointer(2, GL_FLOAT, 0, pTexCoords);
+        pBlitter->pDispatch->TexCoordPointer(2, GL_FLOAT, 0, pTexCoords);
 
         pBlitter->pDispatch->Enable(pSrc->target);
@@ -411 +426 @@
     if (pBlitter->pRestoreCtxInfo != &pBlitter->CtxInfo)
     {
-//        GLuint idDrawFBO, idReadFBO;
-//        CR_BLITTER_WINDOW *pRestoreMural = pBlitter->pRestoreMural;
-//        if (pRestoreMural->fUseFBO && crServerSupportRedirMuralFBO())
-//        {
-//            idDrawFBO = pRestoreMural->aidFBOs[pRestoreMural->iCurDrawBuffer];
-//            idReadFBO = pRestoreMural->aidFBOs[pRestoreMural->iCurReadBuffer];
-//        }
-//        else
-//        {
-//            idDrawFBO = 0;
-//            idReadFBO = 0;
-//        }
 
         pBlitter->pDispatch->MakeCurrent(pBlitter->pRestoreMural->Base.id, 0,
                 pBlitter->pRestoreCtxInfo->Base.id >= 0
                     ? pBlitter->pRestoreCtxInfo->Base.id : pBlitter->pRestoreCtxInfo->Base.id);
-//        crStateSwitchPostprocess(pBlitter->pRestoreCtxInfo->pContext, NULL, idDrawFBO, idReadFBO);
     }
     else
@@ -455 +457 @@
         pBlitter->pRestoreCtxInfo = pRestoreCtxInfo;
         pBlitter->pRestoreMural = pRestoreMural;
-
-//        GLuint idDrawFBO, idReadFBO;
-//
-//        if (pRestoreMural->fUseFBO && crServerSupportRedirMuralFBO())
-//        {
-//            idDrawFBO = pRestoreMural->aidFBOs[pRestoreMural->iCurDrawBuffer];
-//            idReadFBO = pRestoreMural->aidFBOs[pRestoreMural->iCurReadBuffer];
-//        }
-//        else
-//        {
-//            idDrawFBO = 0;
-//            idReadFBO = 0;
-//        }
-//        crStateSwitchPrepare(NULL, pRestoreCtxInfo->pContext, idDrawFBO, idReadFBO);
 
         pBlitter->pDispatch->Flush();