Changeset 82165 in vbox for trunk/src

Timestamp:

Nov 25, 2019 11:18:42 AM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: OpenGL backend: fixes for compressed textures.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (3 diffs)
• DevVGA-SVGA3d-ogl.cpp (modified) (12 diffs)
• DevVGA-SVGA3d.cpp (modified) (1 diff)

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

@@ -410 +410 @@
     /** Height in blocks: (height + cyBlock - 1) / cyBlock. SSM: not saved, recalculated on load. */
     uint32_t                cBlocksY;
+    /** Number of blocks: cBlocksX * cBlocksY * mipmapSize.depth. SSM: not saved, recalculated on load. */
+    uint32_t                cBlocks;
     /** The scanline/pitch size in bytes: at least cBlocksX * cbBlock. */
     uint32_t                cbSurfacePitch;
@@ -582 +584 @@
     uint32_t                cxBlock;        /* Block width in pixels. SSM: not saved, recalculated on load. */
     uint32_t                cyBlock;        /* Block height in pixels. SSM: not saved, recalculated on load. */
+#ifdef VMSVGA3D_OPENGL
+    uint32_t                cbBlockGL;      /* Block size of the OpenGL texture, same as cbBlock for not-emulated formats. */
+#endif
 
     /* Dirty state; surface was manually updated. */
@@ -1056 +1061 @@
         PFNGLDRAWARRAYSINSTANCEDPROC                    glDrawArraysInstanced;
         PFNGLDRAWELEMENTSINSTANCEDPROC                  glDrawElementsInstanced;
+        PFNGLGETCOMPRESSEDTEXIMAGEPROC                  glGetCompressedTexImage;
         PFNGLCOMPRESSEDTEXIMAGE2DPROC                   glCompressedTexImage2D;
         PFNGLCOMPRESSEDTEXIMAGE3DPROC                   glCompressedTexImage3D;

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

@@ -686 +686 @@
     GLGETPROC_(PFNGLTEXIMAGE3DPROC                       , glTexImage3D, "");
     GLGETPROC_(PFNGLTEXSUBIMAGE3DPROC                    , glTexSubImage3D, "");
+    GLGETPROC_(PFNGLGETCOMPRESSEDTEXIMAGEPROC            , glGetCompressedTexImage, "");
     GLGETPROC_(PFNGLCOMPRESSEDTEXIMAGE2DPROC             , glCompressedTexImage2D, "");
     GLGETPROC_(PFNGLCOMPRESSEDTEXIMAGE3DPROC             , glCompressedTexImage3D, "");
@@ -1645 +1646 @@
 #define AssertTestFmt(f) do {} while(0)
 #endif
+    /* Init cbBlockGL for non-emulated formats. */
+    pSurface->cbBlockGL = pSurface->cbBlock;
+
     switch (format)
     {
@@ -1939 +1943 @@
         pSurface->formatGL = GL_BGRA;
         pSurface->typeGL = GL_UNSIGNED_INT_8_8_8_8_REV;
+        pSurface->cbBlockGL = 4 * pSurface->cxBlock * pSurface->cyBlock;
         break;
 
@@ -2127 +2132 @@
                     || pSurfaceDst->internalFormatGL == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT)
                 {
+                    uint32_t const cBlocksX = (clipBox.w + pSurfaceSrc->cxBlock - 1) / pSurfaceSrc->cxBlock;
+                    uint32_t const cBlocksY = (clipBox.h + pSurfaceSrc->cyBlock - 1) / pSurfaceSrc->cyBlock;
+                    uint32_t const imageSize = cBlocksX * cBlocksY * clipBox.d * pSurfaceSrc->cbBlock;
                     pState->ext.glCompressedTexSubImage3D(target, dest.mipmap,
                                                           clipBox.x, clipBox.y, clipBox.z,
                                                           clipBox.w, clipBox.h, clipBox.d,
-                                                          pSurfaceSrc->formatGL, pSurfaceSrc->typeGL, pSrcBits);
+                                                          pSurfaceSrc->internalFormatGL, (GLsizei)imageSize, pSrcBits);
                     VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
                 }
@@ -2148 +2156 @@
                     || pSurfaceDst->internalFormatGL == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT)
                 {
+                    uint32_t const cBlocksX = (clipBox.w + pSurfaceSrc->cxBlock - 1) / pSurfaceSrc->cxBlock;
+                    uint32_t const cBlocksY = (clipBox.h + pSurfaceSrc->cyBlock - 1) / pSurfaceSrc->cyBlock;
+                    uint32_t const imageSize = cBlocksX * cBlocksY * pSurfaceSrc->cbBlock;
                     pState->ext.glCompressedTexSubImage2D(target, dest.mipmap,
                                                           clipBox.x, clipBox.y, clipBox.w, clipBox.h,
-                                                          pSurfaceSrc->formatGL, pSurfaceSrc->typeGL, pSrcBits);
+                                                          pSurfaceSrc->internalFormatGL, (GLsizei)imageSize, pSrcBits);
                     VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
                 }
@@ -2847 +2858 @@
         uint32_t cbSurfacePitch;
         uint8_t *pDoubleBuffer;
-        uint32_t offHst;
+        uint64_t offHst;
 
         uint32_t const u32HostBlockX = pBox->x / pSurface->cxBlock;
         uint32_t const u32HostBlockY = pBox->y / pSurface->cyBlock;
+        uint32_t const u32HostZ      = pBox->z;
         Assert(u32HostBlockX * pSurface->cxBlock == pBox->x);
         Assert(u32HostBlockY * pSurface->cyBlock == pBox->y);
@@ -2856 +2868 @@
         uint32_t const u32GuestBlockX = pBox->srcx / pSurface->cxBlock;
         uint32_t const u32GuestBlockY = pBox->srcy / pSurface->cyBlock;
+        uint32_t const u32GuestZ      = pBox->srcz / pSurface->cyBlock;
         Assert(u32GuestBlockX * pSurface->cxBlock == pBox->srcx);
         Assert(u32GuestBlockY * pSurface->cyBlock == pBox->srcy);
@@ -2878 +2891 @@
         }
 
-        /* The buffer must be large enough to hold entire texture in the OpenGL format.
-         * Multiply by the width and height "reduction" factors.
-         * This can allocate more memory than required, but it is simpler for now.
-         * Actually cbBuf = cbGLPixel * pMipmapLevel->mipmapSize.width * pMipmapLevel->mipmapSize.height
-         */
-        pDoubleBuffer = (uint8_t *)RTMemAlloc(pMipLevel->cbSurface * pSurface->cxBlock * pSurface->cyBlock);
+        /* The buffer must be large enough to hold entire texture in the OpenGL format. */
+        pDoubleBuffer = (uint8_t *)RTMemAlloc(pSurface->cbBlockGL * pMipLevel->cBlocks);
         AssertReturn(pDoubleBuffer, VERR_NO_MEMORY);
 
         if (transfer == SVGA3D_READ_HOST_VRAM)
         {
+            /* Read the entire texture to the double buffer. */
             GLint activeTexture;
 
@@ -2906 +2916 @@
             vmsvga3dOglSetPackParams(pState, pContext, pSurface, &SavedParams);
 
-            glGetTexImage(texImageTarget,
-                          uHostMipmap,
-                          pSurface->formatGL,
-                          pSurface->typeGL,
-                          pDoubleBuffer);
-            VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
+            if (   pSurface->internalFormatGL == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
+                || pSurface->internalFormatGL == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
+                || pSurface->internalFormatGL == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT)
+            {
+                pState->ext.glGetCompressedTexImage(texImageTarget, uHostMipmap, pDoubleBuffer);
+                VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
+            }
+            else
+            {
+                glGetTexImage(texImageTarget, uHostMipmap, pSurface->formatGL, pSurface->typeGL, pDoubleBuffer);
+                VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
+            }
 
             vmsvga3dOglRestorePackParams(pState, pContext, pSurface, &SavedParams);
@@ -2919 +2935 @@
             VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
 
-            offHst = u32HostBlockX * pSurface->cbBlock + u32HostBlockY * pMipLevel->cbSurfacePitch;
+            offHst = u32HostBlockX * pSurface->cbBlock + u32HostBlockY * pMipLevel->cbSurfacePitch + u32HostZ * pMipLevel->cbSurfacePlane;
             cbSurfacePitch = pMipLevel->cbSurfacePitch;
         }
@@ -2929 +2945 @@
         }
 
-        uint32_t const offGst = u32GuestBlockX * pSurface->cbBlock + u32GuestBlockY * cbGuestPitch;
-
-        rc = vmsvgaR3GmrTransfer(pThis,
-                                 pThisCC,
-                                 transfer,
-                                 pDoubleBuffer,
-                                 pMipLevel->cbSurface,
-                                 offHst,
-                                 cbSurfacePitch,
-                                 GuestPtr,
-                                 offGst,
-                                 cbGuestPitch,
-                                 cBlocksX * pSurface->cbBlock,
-                                 cBlocksY);
-        AssertRC(rc);
+        uint64_t offGst = u32GuestBlockX * pSurface->cbBlock + u32GuestBlockY * cbGuestPitch + u32GuestZ * cbGuestPitch * pMipLevel->mipmapSize.height;
+
+        for (uint32_t iPlane = 0; iPlane < pBox->d; ++iPlane)
+        {
+            AssertBreak(offHst < UINT32_MAX);
+            AssertBreak(offGst < UINT32_MAX);
+
+            rc = vmsvgaR3GmrTransfer(pThis,
+                                     pThisCC,
+                                     transfer,
+                                     pDoubleBuffer,
+                                     pMipLevel->cbSurface,
+                                     (uint32_t)offHst,
+                                     cbSurfacePitch,
+                                     GuestPtr,
+                                     (uint32_t)offGst,
+                                     cbGuestPitch,
+                                     cBlocksX * pSurface->cbBlock,
+                                     cBlocksY);
+            AssertRC(rc);
+
+            offHst += pMipLevel->cbSurfacePlane;
+            offGst += pMipLevel->mipmapSize.height * cbGuestPitch;
+        }
 
         /* Update the opengl surface data. */
@@ -2977 +3002 @@
                                                           pBox->h,
                                                           pBox->d,
-                                                          pSurface->formatGL,
-                                                          pSurface->typeGL,
+                                                          pSurface->internalFormatGL,
+                                                          cbSurfacePitch * cBlocksY * pBox->d,
                                                           pDoubleBuffer);
                 }

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

@@ -314 +314 @@
         pMipmapLevel->cBlocksX       = cBlocksX;
         pMipmapLevel->cBlocksY       = cBlocksY;
+        pMipmapLevel->cBlocks        = cBlocksX * cBlocksY * pMipmapLevel->mipmapSize.depth;
         pMipmapLevel->cbSurfacePitch = cbSurfacePitch;
         pMipmapLevel->cbSurfacePlane = cbSurfacePlane;