Changeset 38394 in vbox

Timestamp:

Aug 10, 2011 11:46:47 AM (14 years ago)

Author:

vboxsync

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

73429

Message:

crOpenGL: add workaround for #5831

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_bufferobject.c (modified) (9 diffs)
• state_snapshot.c (modified) (3 diffs)

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

@@ -998 +998 @@
         /*@todo, move to state_client.c*/
         cp = &toCtx->client.array.v;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1005 +1005 @@
 
         cp = &toCtx->client.array.c;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1012 +1012 @@
 
         cp = &toCtx->client.array.f;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1019 +1019 @@
 
         cp = &toCtx->client.array.s;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1026 +1026 @@
 
         cp = &toCtx->client.array.e;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1033 +1033 @@
 
         cp = &toCtx->client.array.i;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1040 +1040 @@
 
         cp = &toCtx->client.array.n;
-        if (cp->buffer->id || locked)
+        if (cp->buffer && (cp->buffer->id || locked))
         {
             diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);
@@ -1049 +1049 @@
         {
             cp = &toCtx->client.array.t[i];
-            if (cp->buffer->id || locked)
+            if (cp->buffer && (cp->buffer->id || locked))
             {
                 if (diff_api.ActiveTextureARB)
@@ -1065 +1065 @@
         {
             cp = &toCtx->client.array.a[i];
-            if (cp->buffer->id || locked)
+            if (cp->buffer && (cp->buffer->id || locked))
             {
                 diff_api.BindBufferARB(GL_ARRAY_BUFFER_ARB, cp->buffer->hwid);

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

@@ -879 +879 @@
     cp->buffer = ui==0 ? pContext->bufferobject.nullBuffer : crHashtableSearch(pContext->shared->buffersTable, ui);
 
+    if (!cp->buffer)
+    {
+        crWarning("crStateLoadClientPointer: ui=%d loaded as NULL buffer!", ui);
+    }
+
 #ifdef CR_EXT_compiled_vertex_array
     if (cp->locked)
@@ -1992 +1997 @@
 
                 rc = SSMR3GetMem(pSSM, &pProgram->pUniforms[k].type, sizeof(GLenum));
+                AssertRCReturn(rc, rc);
                 pProgram->pUniforms[k].name = crStateLoadString(pSSM);
 
@@ -2004 +2010 @@
 
                 rc = SSMR3GetMem(pSSM, pProgram->pUniforms[k].data, datasize);
+                AssertRCReturn(rc, rc);
             }
         }