Changeset 55832 in vbox

Timestamp:

May 12, 2015 5:13:28 PM (10 years ago)

Author:

vboxsync

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

100273

Message:

Host 3D: back to usage of DEPTH_STENCIL attachement.

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (4 diffs)
• HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -256 +256 @@
     GLint iCurReadBuffer;
 
-    GLuint idDepthRB;
-    GLuint idStencilRB;
+    GLuint idDepthStencilRB;
     GLuint fboWidth, fboHeight;
 

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

@@ -1317 +1317 @@
     {
         rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-            pMural ? pMural->idDepthRB : 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
+            pMural ? pMural->idDepthStencilRB : 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
         AssertReturn(rc == VINF_SUCCESS, rc);
 
@@ -1326 +1326 @@
 
         rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-            pMural ? pMural->idDepthRB : 0, width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
+            pMural ? pMural->idDepthStencilRB : 0, width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
         AssertReturn(rc == VINF_SUCCESS, rc);
 
@@ -1351 +1351 @@
     {
         rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-            pMural ? pMural->idDepthRB : 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
+            pMural ? pMural->idDepthStencilRB : 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
         AssertReturn(rc == VINF_SUCCESS, rc);
 
@@ -1363 +1363 @@
     {
         rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-            pMural ? pMural->idDepthRB : 0, width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
+            pMural ? pMural->idDepthStencilRB : 0, width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
         AssertReturn(rc == VINF_SUCCESS, rc);
     }

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

@@ -551 +551 @@
     }
 
-    /* Depth. */
-    gl->GenRenderbuffersEXT(1, &mural->idDepthRB);
-    gl->BindRenderbufferEXT(GL_RENDERBUFFER_EXT, mural->idDepthRB);
-    gl->RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT,
-                           mural->width, mural->height);
-
-    /* Stencil. */
-    gl->GenRenderbuffersEXT(1, &mural->idStencilRB);
-    gl->BindRenderbufferEXT(GL_RENDERBUFFER_EXT, mural->idStencilRB);
-    gl->RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_STENCIL_INDEX,
+    /* Depth & Stencil. */
+    gl->GenRenderbuffersEXT(1, &mural->idDepthStencilRB);
+    gl->BindRenderbufferEXT(GL_RENDERBUFFER_EXT, mural->idDepthStencilRB);
+    gl->RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8_EXT,
                            mural->width, mural->height);
 
@@ -572 +566 @@
                                     GL_TEXTURE_2D, mural->aidColorTexs[i], 0);
         gl->FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
-                                       GL_RENDERBUFFER_EXT, mural->idDepthRB);
+                                       GL_RENDERBUFFER_EXT, mural->idDepthStencilRB);
         gl->FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT,
-                                       GL_RENDERBUFFER_EXT, mural->idStencilRB);
+                                       GL_RENDERBUFFER_EXT, mural->idDepthStencilRB);
 
         status = gl->CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
@@ -633 +627 @@
         }
 
-        cr_server.head_spu->dispatch_table.DeleteRenderbuffersEXT(1, &mural->idDepthRB);
-        mural->idDepthRB = 0;
-
-        cr_server.head_spu->dispatch_table.DeleteRenderbuffersEXT(1, &mural->idStencilRB);
-        mural->idStencilRB = 0;
+        cr_server.head_spu->dispatch_table.DeleteRenderbuffersEXT(1, &mural->idDepthStencilRB);
+        mural->idDepthStencilRB = 0;
 
         for (i = 0; i < mural->cBuffers; ++i)