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

Timestamp:

May 6, 2015 3:08:59 AM (10 years ago)

Author:

vboxsync

Message:

SVGA3d: mipmap related patch from trivirt.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-ogl.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (5 diffs)

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

@@ -3095 +3095 @@
     vmsvga3dSetUnpackParams(pState, pContext, pSurface, &SavedParams);
 
+    /* Set the mipmap base and max level paramters. */
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+    VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, pSurface->faces[0].numMipLevels);
+    VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
+
     if (pSurface->fDirty)
-    {
         Log(("vmsvga3dCreateTexture: sync dirty texture\n"));
-        for (uint32_t i = 0; i < pSurface->faces[0].numMipLevels; i++)
-        {
-            /* Paranoia: Always do level 0 here to mirror the non-dirty case. */
-            if (pSurface->pMipmapLevels[i].fDirty || i == 0)
-            {
-                if (pSurface->pMipmapLevels[i].fDirty)
-                    Log(("vmsvga3dCreateTexture: sync dirty texture mipmap level %d (pitch %x)\n", i, pSurface->pMipmapLevels[i].cbSurfacePitch));
-
-                glTexImage2D(GL_TEXTURE_2D,
-                             i,
-                             pSurface->internalFormatGL,
-                             pSurface->pMipmapLevels[i].size.width,
-                             pSurface->pMipmapLevels[i].size.height,
-                             0,
-                             pSurface->formatGL,
-                             pSurface->typeGL,
-                             pSurface->pMipmapLevels[i].pSurfaceData);
-
-                VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
-
-                pSurface->pMipmapLevels[i].fDirty = false;
-            }
-        }
-        pSurface->fDirty = false;
-    }
-    else
+
+    /* Always allocate and initialize all mipmap levels; non-initialized mipmap levels used as render targets cause failures. */
+    for (uint32_t i = 0; i < pSurface->faces[0].numMipLevels; i++)
     {
         /* Allocate and initialize texture memory.  Passing the zero filled pSurfaceData avoids
-           exposing random host memory to the guest and helps a with the fedora 21 surface
-           corruption issues (launchpad, background, search field, login). */
+            exposing random host memory to the guest and helps a with the fedora 21 surface
+            corruption issues (launchpad, background, search field, login). */
+        if (pSurface->pMipmapLevels[i].fDirty)
+            Log(("vmsvga3dCreateTexture: sync dirty texture mipmap level %d (pitch %x)\n", i, pSurface->pMipmapLevels[i].cbSurfacePitch));
+
         glTexImage2D(GL_TEXTURE_2D,
-                     0,
-                     pSurface->internalFormatGL,
-                     pSurface->pMipmapLevels[0].size.width,
-                     pSurface->pMipmapLevels[0].size.height,
-                     0,
-                     pSurface->formatGL,
-                     pSurface->typeGL,
-                     pSurface->pMipmapLevels[0].pSurfaceData);
-        VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
-    }
+                        i,
+                        pSurface->internalFormatGL,
+                        pSurface->pMipmapLevels[i].size.width,
+                        pSurface->pMipmapLevels[i].size.height,
+                        0,
+                        pSurface->formatGL,
+                        pSurface->typeGL,
+                        pSurface->pMipmapLevels[i].pSurfaceData);
+
+        VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
+
+        pSurface->pMipmapLevels[i].fDirty = false;
+    }
+    pSurface->fDirty = false;
 
     /* Restore unpacking parameters. */
@@ -5773 +5762 @@
     AssertReturn(type < SVGA3D_RT_MAX, VERR_INVALID_PARAMETER);
     AssertReturn(target.face == 0, VERR_INVALID_PARAMETER);
-    AssertReturn(target.mipmap == 0, VERR_INVALID_PARAMETER);
 
     Log(("vmsvga3dSetRenderTarget cid=%x type=%x surface id=%x\n", cid, type, target.sid));
@@ -5827 +5815 @@
     case SVGA3D_RT_DEPTH:
     case SVGA3D_RT_STENCIL:
+        AssertReturn(target.mipmap == 0, VERR_INVALID_PARAMETER);
         if (pRenderTarget->oglId.texture == OPENGL_INVALID_ID)
         {

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

@@ -4271 +4271 @@
     AssertReturn(type < SVGA3D_RT_MAX, VERR_INVALID_PARAMETER);
     AssertReturn(target.face == 0, VERR_INVALID_PARAMETER);
-    AssertReturn(target.mipmap == 0, VERR_INVALID_PARAMETER);
 
     Log(("vmsvga3dSetRenderTarget cid=%x type=%x surface id=%x\n", cid, type, target.sid));
@@ -4350 +4349 @@
     case SVGA3D_RT_DEPTH:
     case SVGA3D_RT_STENCIL:
+        AssertReturn(target.mipmap == 0, VERR_INVALID_PARAMETER);
         if (!pRenderTarget->u.pSurface)
         {
@@ -4495 +4495 @@
                 AssertReturn(pSharedSurface, VERR_INTERNAL_ERROR);
 
-                hr = pSharedSurface->u.pTexture->GetSurfaceLevel(0 /* Texture level 0 */,
+                hr = pSharedSurface->u.pTexture->GetSurfaceLevel(target.mipmap,
                                                                  &pSurface);
 
@@ -4502 +4502 @@
             else
 #endif
-                hr = pRenderTarget->u.pTexture->GetSurfaceLevel(0 /* Texture level 0 */,
+                hr = pRenderTarget->u.pTexture->GetSurfaceLevel(target.mipmap,
                                                                 &pSurface);
 
@@ -4509 +4509 @@
         else
         {
+            AssertReturn(target.mipmap == 0, VERR_INVALID_PARAMETER);
             if (!pRenderTarget->u.pSurface)
             {