Changeset 55761 in vbox for trunk

Timestamp:

May 8, 2015 5:57:05 PM (10 years ago)

Author:

vboxsync

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

100187

Message:

3D: saving state: use separate buffers for DEPTH and STENCIL data. Needs more testing.

Location:

trunk/src/VBox

Files:

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

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

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

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

@@ -1308 +1308 @@
         pEl = &pData->aElements[pData->cElements];
         pEl->idFBO = pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0;
-        pEl->enmBuffer = 0; /* we do not care */
+        pEl->enmBuffer = pMural ? pMural->idDepthRB : 0;
         pEl->posX = 0;
         pEl->posY = 0;
@@ -1338 +1338 @@
         pEl = &pData->aElements[pData->cElements];
         pEl->idFBO = pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0;
-        pEl->enmBuffer = 0; /* we do not care */
+        pEl->enmBuffer = pMural ? pMural->idDepthRB : 0;
         pEl->posX = 0;
         pEl->posY = 0;

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

@@ -543 +543 @@
     }
 
-    /*Depth&Stencil*/
-    gl->GenRenderbuffersEXT(1, &mural->idDepthStencilRB);
-    gl->BindRenderbufferEXT(GL_RENDERBUFFER_EXT, mural->idDepthStencilRB);
-    gl->RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8_EXT,
+    /* 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,
                            mural->width, mural->height);
 
@@ -558 +564 @@
                                     GL_TEXTURE_2D, mural->aidColorTexs[i], 0);
         gl->FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
-                                       GL_RENDERBUFFER_EXT, mural->idDepthStencilRB);
+                                       GL_RENDERBUFFER_EXT, mural->idDepthRB);
         gl->FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT,
-                                       GL_RENDERBUFFER_EXT, mural->idDepthStencilRB);
+                                       GL_RENDERBUFFER_EXT, mural->idStencilRB);
 
         status = gl->CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
@@ -619 +625 @@
         }
 
-        cr_server.head_spu->dispatch_table.DeleteRenderbuffersEXT(1, &mural->idDepthStencilRB);
-        mural->idDepthStencilRB = 0;
+        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;
 
         for (i = 0; i < mural->cBuffers; ++i)