Changeset 53400 in vbox for trunk

Timestamp:

Nov 26, 2014 11:25:27 AM (10 years ago)

Author:

vboxsync

Message:

Restore 3D state: fix SEGFAULT on X11 host (Linux): bind to corresponding (frame-, render-) buffer before put data into it (tested on X11 only).

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/state_tracker/state_diff.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c

@@ -308 +308 @@
         {
             CRFBDataElement *el = &data->aElements[i];
+            bool fUseRenderBuffer =
+                (el->enmFormat == GL_STENCIL_INDEX || el->enmFormat == GL_DEPTH_COMPONENT || el->enmFormat == GL_DEPTH_STENCIL);
 #if 0
             char fname[200];
@@ -343 +345 @@
             }
 
-            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, el->idFBO);
+            /* Bind to corresponding buffer. */
+            if (fUseRenderBuffer)
+                diff_api.BindRenderbufferEXT(GL_RENDERBUFFER_EXT, el->idFBO);
+            else
+                diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, el->idFBO);
 
             if (el->enmBuffer)
@@ -380 +386 @@
                 diff_api.Disable(GL_STENCIL_TEST);
             }
+
+            /* Bind to window system default buffer. */
+            if (fUseRenderBuffer)
+                diff_api.BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+            else
+                diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
         }
 

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

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