Changeset 32058 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Aug 27, 2010 4:52:59 PM (15 years ago)

Author:

vboxsync

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

65315

Message:

crOpenGL/WDDM3D: fix rare guest apps stack override on startup

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texdiff.c (modified) (6 diffs)

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

@@ -185 +185 @@
                 activeUnit = i;
             }
-            if (from->unit[i].currentTexture1D->id != to->unit[i].currentTexture1D->id) 
+            if (from->unit[i].currentTexture1D->hwid != to->unit[i].currentTexture1D->hwid)
             {
                 diff_api.BindTexture(GL_TEXTURE_1D, crStateGetTextureObjHWID(to->unit[i].currentTexture1D));
@@ -191 +191 @@
                 FILLDIRTY(tb->dirty);
             }
-            if (from->unit[i].currentTexture2D->id != to->unit[i].currentTexture2D->id) 
+            if (from->unit[i].currentTexture2D->hwid != to->unit[i].currentTexture2D->hwid)
             {
                 diff_api.BindTexture(GL_TEXTURE_2D, crStateGetTextureObjHWID(to->unit[i].currentTexture2D));
@@ -198 +198 @@
             }
 #ifdef CR_OPENGL_VERSION_1_2
-            if (from->unit[i].currentTexture3D->id != to->unit[i].currentTexture3D->id) {
+            if (from->unit[i].currentTexture3D->hwid != to->unit[i].currentTexture3D->hwid)
+            {
                 diff_api.BindTexture(GL_TEXTURE_3D, crStateGetTextureObjHWID(to->unit[i].currentTexture3D));
                 FILLDIRTY(tb->current[i]);
@@ -206 +207 @@
 #ifdef CR_ARB_texture_cube_map
             if (fromCtx->extensions.ARB_texture_cube_map &&
-                from->unit[i].currentTextureCubeMap->id != to->unit[i].currentTextureCubeMap->id) {
+                from->unit[i].currentTextureCubeMap->hwid != to->unit[i].currentTextureCubeMap->hwid)
+            {
                 diff_api.BindTexture(GL_TEXTURE_CUBE_MAP_ARB, crStateGetTextureObjHWID(to->unit[i].currentTextureCubeMap));
                 FILLDIRTY(tb->current[i]);
@@ -214 +216 @@
 #ifdef CR_NV_texture_rectangle
             if (fromCtx->extensions.NV_texture_rectangle &&
-                from->unit[i].currentTextureRect->id != to->unit[i].currentTextureRect->id) {
+                from->unit[i].currentTextureRect->hwid != to->unit[i].currentTextureRect->hwid)
+            {
                 diff_api.BindTexture(GL_TEXTURE_RECTANGLE_NV, crStateGetTextureObjHWID(to->unit[i].currentTextureRect));
                 FILLDIRTY(tb->current[i]);
@@ -220 +223 @@
             }
 #endif
+            CLEARDIRTY(tb->current[i], nbitID);
         }