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

Timestamp:

Dec 6, 2012 2:49:40 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix buffer object refferencing

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_bufferobject.c (modified) (2 diffs)
• state_client.c (modified) (10 diffs)

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

@@ -251 +251 @@
     CRStateBits *sb = GetCurrentBits();
     CRBufferObjectBits *bb = &(sb->bufferobject);
-    int i;
+    int i, j, k;
 
     FLUSH();
@@ -302 +302 @@
                 }
 #endif
-                /* @todo check bindings with the vertex arrays */
-
+
+#ifdef CR_ARB_vertex_buffer_object
+                for (j=0; j<CRSTATECLIENT_MAX_VERTEXARRAYS; ++j)
+                {
+                    CRClientPointer *cp = crStateGetClientPointerByIndex(i, &g->client.array);
+                    if (obj == cp->buffer)
+                    {
+                        cp->buffer = b->nullBuffer;
+                        ++b->nullBuffer->refCount;
+                    }
+                }
+
+                for (k=0; k<g->client.vertexArrayStackDepth; ++k)
+                {
+                    CRVertexArrays *pArray = &g->client.vertexArrayStack[k];
+                    for (j=0; j<CRSTATECLIENT_MAX_VERTEXARRAYS; ++j)
+                    {
+                        CRClientPointer *cp = crStateGetClientPointerByIndex(i, pArray);
+                        if (obj == cp->buffer)
+                        {
+                            cp->buffer = b->nullBuffer;
+                            ++b->nullBuffer->refCount;
+                        }
+                    }
+                }
+#endif
                 crHashtableDelete(g->shared->buffersTable, buffers[i], crStateFreeBufferObject);
             }

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

@@ -153 +153 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.v.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.v.buffer)
+        ++c->array.v.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -168 +170 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.c.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.c.buffer)
+        ++c->array.c.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -183 +187 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.f.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.f.buffer)
+        ++c->array.f.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -198 +204 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.s.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.s.buffer)
+        ++c->array.s.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -213 +221 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.e.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.e.buffer)
+        ++c->array.e.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -228 +238 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.i.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.i.buffer)
+        ++c->array.i.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -243 +255 @@
 #ifdef CR_ARB_vertex_buffer_object
     c->array.n.buffer = g ? g->bufferobject.arrayBuffer : NULL;
+    if (c->array.n.buffer)
+        ++c->array.n.buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -260 +274 @@
 #ifdef CR_ARB_vertex_buffer_object
         c->array.t[i].buffer = g ? g->bufferobject.arrayBuffer : NULL;
+        if (c->array.t[i].buffer)
+            ++c->array.t[i].buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -277 +293 @@
 #ifdef CR_ARB_vertex_buffer_object
         c->array.a[i].buffer = g ? g->bufferobject.arrayBuffer : NULL;
+        if (c->array.a[i].buffer)
+            ++c->array.a[i].buffer->refCount;
 #endif
 #ifdef CR_EXT_compiled_vertex_array
@@ -623 +641 @@
 
 #ifdef CR_ARB_vertex_buffer_object
+    if (cp->buffer)
+    {
+        --cp->buffer->refCount;
+        CRASSERT(cp->buffer->refCount && cp->buffer->refCount < UINT32_MAX/2);
+    }
     cp->buffer = g->bufferobject.arrayBuffer;
+    if (cp->buffer)
+        ++cp->buffer->refCount;
 #endif
 }