Changeset 75695 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

Timestamp:

Nov 23, 2018 7:06:36 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126894

Message:

DevVGA-SVGA3d-ogl.cpp: Z_DF16 is not supported by OpenGL; use texture for depth/stencil render targets.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (6 diffs)

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

@@ -1228 +1228 @@
     case SVGA3D_DEVCAP_SURFACEFMT_Z_D24S8:
     case SVGA3D_DEVCAP_SURFACEFMT_Z_D24X8:
-    case SVGA3D_DEVCAP_SURFACEFMT_Z_DF16:
+    // case SVGA3D_DEVCAP_SURFACEFMT_Z_DF16:
     case SVGA3D_DEVCAP_SURFACEFMT_Z_DF24:
     case SVGA3D_DEVCAP_SURFACEFMT_Z_D24S8_INT:
@@ -2108 +2108 @@
 {
     RT_NOREF(idAssociatedContext);
+
+    LogFunc(("sid=%x\n", pSurface->id));
 
     uint32_t const numMipLevels = pSurface->faces[0].numMipLevels;
@@ -2534 +2536 @@
     switch (pSurface->surfaceFlags & VMSVGA3D_SURFACE_HINT_SWITCH_MASK)
     {
+    case SVGA3D_SURFACE_HINT_TEXTURE | SVGA3D_SURFACE_HINT_DEPTHSTENCIL:
+    case SVGA3D_SURFACE_HINT_DEPTHSTENCIL:
     case SVGA3D_SURFACE_CUBEMAP | SVGA3D_SURFACE_HINT_TEXTURE:
     case SVGA3D_SURFACE_CUBEMAP | SVGA3D_SURFACE_HINT_TEXTURE | SVGA3D_SURFACE_HINT_RENDERTARGET:
@@ -2667 +2671 @@
         break;
     }
-
-    case SVGA3D_SURFACE_HINT_DEPTHSTENCIL:
-        AssertFailed(); /** @todo DMA SVGA3D_SURFACE_HINT_DEPTHSTENCIL */
-        break;
 
     case SVGA3D_SURFACE_HINT_VERTEXBUFFER | SVGA3D_SURFACE_HINT_INDEXBUFFER:
@@ -4420 +4420 @@
     case SVGA3D_RT_STENCIL:
         AssertReturn(target.mipmap == 0, VERR_INVALID_PARAMETER);
+#if 1
+        /* A texture surface can be used as a render target to fill it and later on used as a texture. */
+        if (pRenderTarget->oglId.texture == OPENGL_INVALID_ID)
+        {
+            LogFunc(("create depth texture to be used as render target; surface id=%x type=%d format=%d -> create texture\n",
+                     target.sid, pRenderTarget->surfaceFlags, pRenderTarget->format));
+            int rc = vmsvga3dBackCreateTexture(pState, pContext, cid, pRenderTarget);
+            AssertRCReturn(rc, rc);
+        }
+
+        AssertReturn(pRenderTarget->oglId.texture != OPENGL_INVALID_ID, VERR_INVALID_PARAMETER);
+        Assert(!pRenderTarget->fDirty);
+
+        pRenderTarget->surfaceFlags |= SVGA3D_SURFACE_HINT_DEPTHSTENCIL;
+
+        pState->ext.glFramebufferTexture2D(GL_FRAMEBUFFER,
+                                           (type == SVGA3D_RT_DEPTH) ? GL_DEPTH_ATTACHMENT : GL_STENCIL_ATTACHMENT,
+                                           GL_TEXTURE_2D, pRenderTarget->oglId.texture, target.mipmap);
+        VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
+#else
         if (pRenderTarget->oglId.texture == OPENGL_INVALID_ID)
         {
@@ -4457 +4477 @@
                                               GL_RENDERBUFFER, pRenderTarget->oglId.renderbuffer);
         VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
+#endif
         break;