Changeset 46174 in vbox for trunk/src/VBox/GuestHost

Timestamp:

May 20, 2013 12:17:39 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: texture support fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/state/cr_texture.h (modified) (1 diff)
• state_tracker/state_texture.c (modified) (6 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_texture.h

@@ -243 +243 @@
 DECLEXPORT(GLuint) STATE_APIENTRY crStateGetTextureObjHWID(CRTextureObj *tobj);
 
+void crStateRegTextures(GLsizei n, GLuint *names);
+
 #ifdef __cplusplus
 }

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

@@ -636 +636 @@
 }
 
+void crStateRegTextures(GLsizei n, GLuint *names)
+{
+    CRContext *g = GetCurrentContext();
+    crStateRegNames(g, g->shared->textureTable, n, names);
+}
+
 void crStateGenNames(CRContext *g, CRHashTable *table, GLsizei n, GLuint *names)
 {
@@ -782 +788 @@
         GLuint name = textures[i];
         CRTextureObj *tObj;
+        if (!name)
+            continue;
+
         GET_TOBJ(tObj, g, name);
-        if (name && tObj)
+        if (tObj)
         {
             GLuint j;
@@ -806 +815 @@
             crHashtableDelete(g->shared->textureTable, name, (CRHashtableCallback)crStateDeleteTextureObject);
         }
+        else
+        {
+            /* call crHashtableDelete in any way, to ensure the allocated key is freed */
+            Assert(crHashtableIsKeyUsed(g->shared->textureTable, name));
+            crHashtableDelete(g->shared->textureTable, name, NULL);
+        }
     }
 
@@ -896 +911 @@
     {
 #ifdef IN_GUEST
+        Assert(crHashtableIsKeyUsed(g->shared->textureTable, texture));
         if (used)
         {
@@ -997 +1013 @@
     if (!tobj)
     {
+        Assert(crHashtableIsKeyUsed(g->shared->textureTable, texture));
         tobj = crStateTextureAllocate_t(g, texture);
     }
@@ -3303 +3320 @@
 {
     CRContext *g = GetCurrentContext();
-    CRTextureObj *tobj = GET_TOBJ(tobj, g, id);
+    CRTextureObj *tobj;
+
+    GET_TOBJ(tobj, g, id);
 
 #ifdef DEBUG_misha