Changeset 44812 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker

Timestamp:

Feb 25, 2013 6:32:06 AM (12 years ago)

Author:

vboxsync

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

83932

Message:

crOpenGL: saved state stencil/depth buffer fixes

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c (modified) (7 diffs)

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

@@ -164 +164 @@
         CRFBDataElement *el = &data->aElements[i];
 
+        switch (el->enmFormat)
+        {
+            case GL_DEPTH_COMPONENT:
+                if (!to->buffer.depthTest)
+                {
+                    diff_api.Enable(GL_DEPTH_TEST);
+                }
+                if (to->pixel.depthScale != 1.0f)
+                {
+                    diff_api.PixelTransferf (GL_DEPTH_SCALE, 1.0f);
+                }
+                if (to->pixel.depthBias != 0.0f)
+                {
+                    diff_api.PixelTransferf (GL_DEPTH_BIAS, 0.0f);
+                }
+                break;
+            case GL_STENCIL_INDEX:
+                if (!to->stencil.stencilTest)
+                {
+                    diff_api.Enable(GL_STENCIL_TEST);
+                }
+                if (to->pixel.mapStencil)
+                {
+                    diff_api.PixelTransferi (GL_MAP_STENCIL, GL_FALSE);
+                }
+                if (to->pixel.indexOffset)
+                {
+                    diff_api.PixelTransferi (GL_INDEX_OFFSET, 0);
+                }
+                if (to->pixel.indexShift)
+                {
+                    diff_api.PixelTransferi (GL_INDEX_SHIFT, 0);
+                }
+                break;
+            default:
+                break;
+        }
+
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, el->idFBO);
 
@@ -171 +209 @@
         diff_api.ReadPixels(el->posX, el->posY, el->width, el->height, el->enmFormat, el->enmType, el->pvData);
         crDebug("Acquired %d;%d;%d;%d;%d;0x%p fb image", el->enmBuffer, el->width, el->height, el->enmFormat, el->enmType, el->pvData);
+
+        switch (el->enmFormat)
+        {
+            case GL_DEPTH_COMPONENT:
+                if (to->pixel.depthScale != 1.0f)
+                {
+                    diff_api.PixelTransferf (GL_DEPTH_SCALE, to->pixel.depthScale);
+                }
+                if (to->pixel.depthBias != 0.0f)
+                {
+                    diff_api.PixelTransferf (GL_DEPTH_BIAS, to->pixel.depthBias);
+                }
+                if (!to->buffer.depthTest)
+                {
+                    diff_api.Disable(GL_DEPTH_TEST);
+                }
+                break;
+            case GL_STENCIL_INDEX:
+                if (to->pixel.indexOffset)
+                {
+                    diff_api.PixelTransferi (GL_INDEX_OFFSET, to->pixel.indexOffset);
+                }
+                if (to->pixel.indexShift)
+                {
+                    diff_api.PixelTransferi (GL_INDEX_SHIFT, to->pixel.indexShift);
+                }
+                if (to->pixel.mapStencil)
+                {
+                    diff_api.PixelTransferi (GL_MAP_STENCIL, GL_TRUE);
+                }
+                if (!to->stencil.stencilTest)
+                {
+                    diff_api.Disable(GL_STENCIL_TEST);
+                }
+                break;
+            default:
+                break;
+        }
     }
 
@@ -231 +307 @@
         diff_api.Disable(GL_BLEND);
         diff_api.Disable(GL_COLOR_LOGIC_OP);
+        diff_api.Disable(GL_DEPTH_TEST);
+        diff_api.Disable(GL_STENCIL_TEST);
 
         for (i = 0; i < data->cElements; ++i)
@@ -240 +318 @@
                 case GL_DEPTH_COMPONENT:
                     diff_api.Enable(GL_DEPTH_TEST);
+                    if (to->pixel.depthScale != 1.0f)
+                    {
+                        diff_api.PixelTransferf (GL_DEPTH_SCALE, 1.0f);
+                    }
+                    if (to->pixel.depthBias != 0.0f)
+                    {
+                        diff_api.PixelTransferf (GL_DEPTH_BIAS, 0.0f);
+                    }
                     break;
                 case GL_STENCIL_INDEX:
                     diff_api.Enable(GL_STENCIL_TEST);
+                    if (to->pixel.mapStencil)
+                    {
+                        diff_api.PixelTransferi (GL_MAP_STENCIL, GL_FALSE);
+                    }
+                    if (to->pixel.indexOffset)
+                    {
+                        diff_api.PixelTransferi (GL_INDEX_OFFSET, 0);
+                    }
+                    if (to->pixel.indexShift)
+                    {
+                        diff_api.PixelTransferi (GL_INDEX_SHIFT, 0);
+                    }
                     break;
                 default:
@@ -248 +346 @@
             }
 
+
             diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, el->idFBO);
 
@@ -260 +359 @@
             {
                 case GL_DEPTH_COMPONENT:
-                    if (!to->buffer.depthTest)
-                    {
-                        diff_api.Disable(GL_DEPTH_TEST);
-                    }
+                    if (to->pixel.depthScale != 1.0f)
+                    {
+                        diff_api.PixelTransferf (GL_DEPTH_SCALE, to->pixel.depthScale);
+                    }
+                    if (to->pixel.depthBias != 0.0f)
+                    {
+                        diff_api.PixelTransferf (GL_DEPTH_BIAS, to->pixel.depthBias);
+                    }
+                    diff_api.Disable(GL_DEPTH_TEST);
                     break;
                 case GL_STENCIL_INDEX:
-                    if (!to->stencil.stencilTest)
-                    {
-                        diff_api.Disable(GL_STENCIL_TEST);
-                    }
+                    if (to->pixel.indexOffset)
+                    {
+                        diff_api.PixelTransferi (GL_INDEX_OFFSET, to->pixel.indexOffset);
+                    }
+                    if (to->pixel.indexShift)
+                    {
+                        diff_api.PixelTransferi (GL_INDEX_SHIFT, to->pixel.indexShift);
+                    }
+                    if (to->pixel.mapStencil)
+                    {
+                        diff_api.PixelTransferi (GL_MAP_STENCIL, GL_TRUE);
+                    }
+                    diff_api.Disable(GL_STENCIL_TEST);
                     break;
                 default:
                     break;
             }
-
         }
 
@@ -313 +425 @@
         {
             diff_api.Enable(GL_COLOR_LOGIC_OP);
+        }
+        if (to->buffer.depthTest)
+        {
+            diff_api.Enable(GL_DEPTH_TEST);
+        }
+        if (to->stencil.stencilTest)
+        {
+            diff_api.Enable(GL_STENCIL_TEST);
         }