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

Timestamp:

May 2, 2012 8:37:46 AM (13 years ago)

Author:

vboxsync

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

77709

Message:

crOpenGL,wined3d,wddm: second part of fixing resource leakage, basics for cr commands submission from r0 miniport driver (for r0 visible region reporting, WPF 3D rendering fixes w/o Aero, etc.)

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_init.c (modified) (3 diffs)
• state_texture.c (modified) (3 diffs)

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

@@ -52 +52 @@
  * Callback used for crFreeHashtable().
  */
-static void
-DeleteTextureCallback(void *texObj)
+DECLEXPORT(void)
+crStateDeleteTextureCallback(void *texObj)
 {
 #ifndef IN_GUEST
@@ -74 +74 @@
     CR_STATE_SHAREDOBJ_USAGE_CLEAR(pObj, pData->pCtx);
     if (!CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj))
-        crHashtableDelete(pData->s->textureTable, key, DeleteTextureCallback);
+        crHashtableDelete(pData->s->textureTable, key, crStateDeleteTextureCallback);
 }
 
@@ -116 +116 @@
             gSharedState = NULL;
         }
-        crFreeHashtable(s->textureTable, DeleteTextureCallback);
+        crFreeHashtable(s->textureTable, crStateDeleteTextureCallback);
         crFreeHashtable(s->dlistTable, crFree); /* call crFree for each entry */
         crFreeHashtable(s->buffersTable, crStateFreeBufferObject);

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

@@ -688 +688 @@
 }
 
+static void crStateCleanupTextureRefs(CRContext *g, CRTextureObj *tObj)
+{
+    CRTextureState *t = &(g->texture);
+    GLuint u;
+
+    /*
+     ** reset back to the base texture.
+     */
+    for (u = 0; u < g->limits.maxTextureUnits; u++)
+    {
+        if (tObj == t->unit[u].currentTexture1D)
+        {
+            t->unit[u].currentTexture1D = &(t->base1D);
+        }
+        if (tObj == t->unit[u].currentTexture2D)
+        {
+            t->unit[u].currentTexture2D = &(t->base2D);
+        }
+#ifdef CR_OPENGL_VERSION_1_2
+        if (tObj == t->unit[u].currentTexture3D)
+        {
+            t->unit[u].currentTexture3D = &(t->base3D);
+        }
+#endif
+#ifdef CR_ARB_texture_cube_map
+        if (tObj == t->unit[u].currentTextureCubeMap)
+        {
+            t->unit[u].currentTextureCubeMap = &(t->baseCubeMap);
+        }
+#endif
+#ifdef CR_NV_texture_rectangle
+        if (tObj == t->unit[u].currentTextureRect)
+        {
+            t->unit[u].currentTextureRect = &(t->baseRect);
+        }
+#endif
+
+#ifdef CR_EXT_framebuffer_object
+        crStateTextureCheckFBOAPs(GL_DRAW_FRAMEBUFFER, tObj->id);
+        crStateTextureCheckFBOAPs(GL_READ_FRAMEBUFFER, tObj->id);
+#endif
+    }
+
+}
+
 void STATE_APIENTRY crStateDeleteTextures(GLsizei n, const GLuint *textures) 
 {
@@ -719 +764 @@
         if (name && tObj)
         {
-            GLuint u;
-            /* remove from hashtable */
-            crHashtableDelete(g->shared->textureTable, name, NULL);
-
-            /* if the currentTexture is deleted, 
-             ** reset back to the base texture.
-             */
-            for (u = 0; u < g->limits.maxTextureUnits; u++)
-            {
-                if (tObj == t->unit[u].currentTexture1D) 
-                {
-                    t->unit[u].currentTexture1D = &(t->base1D);
-                }
-                if (tObj == t->unit[u].currentTexture2D) 
-                {
-                    t->unit[u].currentTexture2D = &(t->base2D);
-                }
-#ifdef CR_OPENGL_VERSION_1_2
-                if (tObj == t->unit[u].currentTexture3D) 
-                {
-                    t->unit[u].currentTexture3D = &(t->base3D);
-                }
-#endif
-#ifdef CR_ARB_texture_cube_map
-                if (tObj == t->unit[u].currentTextureCubeMap)
-                {
-                    t->unit[u].currentTextureCubeMap = &(t->baseCubeMap);
-                }
-#endif
-#ifdef CR_NV_texture_rectangle
-                if (tObj == t->unit[u].currentTextureRect)
-                {
-                    t->unit[u].currentTextureRect = &(t->baseRect);
-                }
-#endif
-            }
-
-#ifdef CR_EXT_framebuffer_object
-            crStateTextureCheckFBOAPs(GL_DRAW_FRAMEBUFFER, name);
-            crStateTextureCheckFBOAPs(GL_READ_FRAMEBUFFER, name);
-#endif
-            crStateDeleteTextureObject(tObj);
+            crStateCleanupTextureRefs(g, tObj);
+
+            crHashtableDelete(g->shared->textureTable, name, crStateDeleteTextureObject);
         }
     }
@@ -834 +840 @@
     if (g->transform.matrixMode == GL_TEXTURE) {
         crStateMatrixMode(GL_TEXTURE);
+    }
+}
+
+DECLEXPORT(void) crStateSetTextureUsed(GLuint texture, GLboolean used)
+{
+    CRContext *g = GetCurrentContext();
+    CRTextureObj *tobj;
+
+    if (!texture)
+    {
+        crWarning("crStateSetTextureUsed: null texture name specified!");
+        return;
+    }
+
+    GET_TOBJ(tobj, g, texture);
+    if (!tobj)
+    {
+        crWarning("crStateSetTextureUsed: failed to fined a HW name for texture(%d)!", texture);
+        return;
+    }
+
+    if (used)
+        CR_STATE_SHAREDOBJ_USAGE_SET(tobj, g);
+    else
+    {
+        CRStateBits *sb = GetCurrentBits();
+        CRTextureBits *tb = &(sb->texture);
+        CRTextureState *t = &(g->texture);
+
+        CR_STATE_SHAREDOBJ_USAGE_CLEAR(tobj, g);
+
+        crStateCleanupTextureRefs(g, tobj);
+
+        if (!CR_STATE_SHAREDOBJ_USAGE_IS_USED(tobj))
+            crHashtableDelete(g->shared->textureTable, texture, crStateDeleteTextureCallback);
+
+        DIRTY(tb->dirty, g->neg_bitid);
+        DIRTY(tb->current[t->curTextureUnit], g->neg_bitid);
     }
 }