Changeset 54736 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Mar 12, 2015 8:52:37 PM (10 years ago)

Author:

vboxsync

Message:

vmsvga3dSaveExec: Must set packing parameters before calling glGetTexImage.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-ogl.cpp (modified) (1 diff)
• DevVGA-SVGA3d-shared.h (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -951 +951 @@
 static int  vmsvga3dContextDefineOgl(PVGASTATE pThis, uint32_t cid, uint32_t fFlags);
 static void vmsvgaColor2GLFloatArray(uint32_t color, GLfloat *pRed, GLfloat *pGreen, GLfloat *pBlue, GLfloat *pAlpha);
+static void vmsvga3dSetPackParams(PVMSVGA3DSTATE pState, PVMSVGA3DCONTEXT pContext, PVMSVGA3DSURFACE pSurface,
+                                  PVMSVGAPACKPARAMS pSave);
+static void vmsvga3dRestorePackParams(PVMSVGA3DSTATE pState, PVMSVGA3DCONTEXT pContext, PVMSVGA3DSURFACE pSurface,
+                                      PCVMSVGAPACKPARAMS pSave);
 
 /* Generated by VBoxDef2LazyLoad from the VBoxSVGA3D.def and VBoxSVGA3DObjC.def files. */

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h

@@ -694 +694 @@
                             VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
 
+                            /* Set row length and alignment of the output data. */
+                            VMSVGAPACKPARAMS SavedParams;
+                            vmsvga3dSetPackParams(pState, pContext, pSurface, &SavedParams);
+
                             glGetTexImage(GL_TEXTURE_2D,
                                           i,
@@ -700 +704 @@
                                           pData);
                             VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
+
+                            vmsvga3dRestorePackParams(pState, pContext, pSurface, &SavedParams);
 
                             /* Data follows */