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

Timestamp:

Feb 19, 2013 11:37:13 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: unify saved fb/bb image data format

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_main.c (modified) (4 diffs)
• server_muralfbo.c (modified) (1 diff)
• server_presenter.cpp (modified) (4 diffs)

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

@@ -1056 +1056 @@
         CRASSERT(Tex.hwid);
 
-        pvData = CrHlpGetTexImage(pContext, &Tex, idPBO);
+        pvData = CrHlpGetTexImage(pContext, &Tex, idPBO, GL_RGBA);
         if (!pvData)
         {
@@ -1073 +1073 @@
         CRASSERT(Tex.hwid);
 
-        pvData = CrHlpGetTexImage(pContext, &Tex, idPBO);
+        pvData = CrHlpGetTexImage(pContext, &Tex, idPBO, GL_RGBA);
         if (!pvData)
         {
@@ -1651 +1651 @@
                     Tex.hwid = pMural->aidColorTexs[CR_SERVER_FBO_FB_IDX(pMural)];
                     CRASSERT(Tex.hwid);
-                    CrHlpPutTexImage(pContext, &Tex, pBuf->pFrontImg);
+                    CrHlpPutTexImage(pContext, &Tex, GL_RGBA, pBuf->pFrontImg);
                 }
 
@@ -1658 +1658 @@
                     Tex.hwid = pMural->aidColorTexs[CR_SERVER_FBO_BB_IDX(pMural)];
                     CRASSERT(Tex.hwid);
-                    CrHlpPutTexImage(pContext, &Tex, pBuf->pBackImg);
+                    CrHlpPutTexImage(pContext, &Tex, GL_RGBA, pBuf->pBackImg);
                 }
 

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

@@ -570 +570 @@
     }
 
-    pixels = CrHlpGetTexImage(ctx, &Tex, idPBO);
+    pixels = CrHlpGetTexImage(ctx, &Tex, idPBO, GL_BGRA);
     if (!pixels)
     {

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

@@ -286 +286 @@
 }
 
-void CrHlpPutTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, void *pvData)
+void CrHlpPutTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLenum enmFormat, void *pvData)
 {
     CRASSERT(pTexture->hwid);
@@ -297 +297 @@
 
     /*read the texture, note pixels are NULL for PBO case as it's offset in the buffer*/
-    cr_server.head_spu->dispatch_table.TexSubImage2D(GL_TEXTURE_2D,  0 /* level*/,  0 /*xoffset*/,  0 /*yoffset*/,  pTexture->width, pTexture->height, GL_BGRA, GL_UNSIGNED_BYTE, pvData);
+    cr_server.head_spu->dispatch_table.TexSubImage2D(GL_TEXTURE_2D,  0 /* level*/,  0 /*xoffset*/,  0 /*yoffset*/,  pTexture->width, pTexture->height, enmFormat, GL_UNSIGNED_BYTE, pvData);
 
     /*restore gl state*/
@@ -318 +318 @@
 }
 
-void* CrHlpGetTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLuint idPBO)
+void* CrHlpGetTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLuint idPBO, GLenum enmFormat)
 {
     void *pvData = NULL;
@@ -343 +343 @@
 
     /*read the texture, note pixels are NULL for PBO case as it's offset in the buffer*/
-    cr_server.head_spu->dispatch_table.GetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_BYTE, pvData);
+    cr_server.head_spu->dispatch_table.GetTexImage(GL_TEXTURE_2D, 0, enmFormat, GL_UNSIGNED_BYTE, pvData);
 
     /*restore gl state*/