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

Timestamp:

Aug 28, 2012 11:12:02 AM (13 years ago)

Author:

vboxsync

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

80361

Message:

crOpenGL: fix save state crash (work-around osx driver bug)

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (3 diffs)

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

@@ -309 +309 @@
 {
     int32_t rc, face, i;
-    GLboolean bound = GL_FALSE;
+    GLint bound = 0;
     
     CRASSERT(pTexture && pSSM);
@@ -342 +342 @@
                 if (!bound)
                 {
+                    GLenum getEnum;
                     diff_api.BindTexture(pTexture->target, pTexture->hwid);
-                    bound = GL_TRUE;
+                    bound = 1;
+
+                    /* osx nvidia drivers seem to have a bug that 1x1 TEXTURE_2D texture becmes inaccessible for some reason
+                     * saw that for 1x1 dummy textures generated by wine
+                     * to avoid crashes we skip texture data save if that is the case */
+                    switch (pTexture->target)
+                    {
+                        case GL_TEXTURE_1D:
+                            getEnum = GL_TEXTURE_BINDING_1D;
+                            break;
+                        case GL_TEXTURE_2D:
+                            getEnum = GL_TEXTURE_BINDING_2D;
+                            break;
+                        case GL_TEXTURE_3D:
+                            getEnum = GL_TEXTURE_BINDING_3D;
+                            break;
+                        case GL_TEXTURE_RECTANGLE_ARB:
+                            getEnum = GL_TEXTURE_BINDING_RECTANGLE_ARB;
+                            break;
+                        case GL_TEXTURE_CUBE_MAP_ARB:
+                            getEnum = GL_TEXTURE_BINDING_CUBE_MAP_ARB;
+                            break;
+                        default:
+                            crWarning("unknown texture target: 0x%x", pTexture->target);
+                            getEnum = 0;
+                            break;
+                    }
+
+                    if (getEnum)
+                    {
+                        GLint curTex;
+                        diff_api.GetIntegerv(getEnum, &curTex);
+                        if (curTex != pTexture->hwid)
+                        {
+                            crWarning("texture not bound properly: expected %d, but was %d. Texture state data: target(0x%x), id(%d), w(%d), h(%d)",
+                                    pTexture->hwid, curTex,
+                                    pTexture->target,
+                                    pTexture->id,
+                                    ptl->width,
+                                    ptl->height);
+                            bound = -1;
+                        }
+                    }
+
                 }
 
@@ -363 +407 @@
 
 #ifdef DEBUG
+                *(int*)((char*)pImg+ptl->bytes) = 0xDEADDEAD;
+#endif
+                if (bound > 0)
                 {
-                    GLint w,h=0;
-                    *(int*)((char*)pImg+ptl->bytes) = 0xDEADDEAD;
-                    crDebug("get image: compressed %i, face %i, level %i, width %i, height %i, bytes %i",
-                            ptl->compressed, face, i, ptl->width, ptl->height, ptl->bytes);
-                    diff_api.GetTexLevelParameteriv(target, i, GL_TEXTURE_WIDTH, &w);
-                    diff_api.GetTexLevelParameteriv(target, i, GL_TEXTURE_HEIGHT, &h);
-                    if (w!=ptl->width || h!=ptl->height)
+#ifdef DEBUG
                     {
-                        crWarning("!!!tex size mismatch %i, %i!!!", w, h);
+                        GLint w,h=0;
+                        crDebug("get image: compressed %i, face %i, level %i, width %i, height %i, bytes %i",
+                                ptl->compressed, face, i, ptl->width, ptl->height, ptl->bytes);
+                        diff_api.GetTexLevelParameteriv(target, i, GL_TEXTURE_WIDTH, &w);
+                        diff_api.GetTexLevelParameteriv(target, i, GL_TEXTURE_HEIGHT, &h);
+                        if (w!=ptl->width || h!=ptl->height)
+                        {
+                            crWarning("!!!tex size mismatch %i, %i!!!", w, h);
+                        }
+                    }
+#endif
+
+                    /*@todo: ugly workaround for crashes inside ati driver,
+                     *       they overwrite their own allocated memory in cases where texlevel >=4
+                             and width or height <=2.
+                     */
+                    if (i<4 || (ptl->width>2 && ptl->height>2))
+                    {
+                        if (!ptl->compressed)
+                        {
+                            diff_api.GetTexImage(target, i, ptl->format, ptl->type, pImg);
+                        }
+                        else
+                        {
+                            diff_api.GetCompressedTexImageARB(target, i, pImg);
+                        }
                     }
                 }
-#endif
-
-                /*@todo: ugly workaround for crashes inside ati driver,
-                 *       they overwrite their own allocated memory in cases where texlevel >=4
-                         and width or height <=2.
-                 */
-                if (i<4 || (ptl->width>2 && ptl->height>2))
+                else
                 {
-                    if (!ptl->compressed)
-                    {
-                        diff_api.GetTexImage(target, i, ptl->format, ptl->type, pImg);
-                    }
-                    else
-                    {
-                        diff_api.GetCompressedTexImageARB(target, i, pImg);
-                    }
+                    crMemset(pImg, 0, ptl->bytes);
                 }