Changeset 44125 in vbox for trunk

Timestamp:

Dec 13, 2012 6:02:35 PM (12 years ago)

Author:

vboxsync

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

82707

Message:

crOpenGL: fix guest state bits

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu_bufferobject.c (modified) (1 diff)
• Additions/common/crOpenGL/pack/packspu_framebuffer.c (modified) (1 diff)
• Additions/common/crOpenGL/pack/packspu_special (modified) (1 diff)
• GuestHost/OpenGL/include/cr_hash.h (modified) (1 diff)
• GuestHost/OpenGL/include/state/cr_bufferobject.h (modified) (1 diff)
• GuestHost/OpenGL/include/state/cr_framebuffer.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_bufferobject.c (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_framebuffer.c (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_texture.c (modified) (1 diff)
• GuestHost/OpenGL/util/hash.c (modified) (5 diffs)
• GuestHost/OpenGL/util/util.def (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_bufferobject.c

@@ -131 +131 @@
     crPackBindBufferARB(target, buffer);
 }
+
+void PACKSPU_APIENTRY packspu_GenBuffersARB( GLsizei n, GLuint * buffer )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+    if (!CRPACKSPU_IS_WDDM_CRHGSMI() && !(pack_spu.thread[pack_spu.idxThreadInUse].netServer.conn->actual_network))
+    {
+        crError( "packspu_GenBuffersARB doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" );
+    }
+    if (pack_spu.swap)
+    {
+        crPackGenBuffersARBSWAP( n, buffer, &writeback );
+    }
+    else
+    {
+        crPackGenBuffersARB( n, buffer, &writeback );
+    }
+    packspuFlush( (void *) thread );
+    CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
+
+    crStateRegBuffers(n, buffer);
+}

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c

@@ -98 +98 @@
     return status;
 }
+
+void PACKSPU_APIENTRY packspu_GenFramebuffersEXT( GLsizei n, GLuint * framebuffers )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+    if (!CRPACKSPU_IS_WDDM_CRHGSMI() && !(pack_spu.thread[pack_spu.idxThreadInUse].netServer.conn->actual_network))
+    {
+        crError( "packspu_GenFramebuffersEXT doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" );
+    }
+    if (pack_spu.swap)
+    {
+        crPackGenFramebuffersEXTSWAP( n, framebuffers, &writeback );
+    }
+    else
+    {
+        crPackGenFramebuffersEXT( n, framebuffers, &writeback );
+    }
+    packspuFlush( (void *) thread );
+    CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
+
+    crStateRegFramebuffers(n, framebuffers);
+}
+
+void PACKSPU_APIENTRY packspu_GenRenderbuffersEXT( GLsizei n, GLuint * renderbuffers )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+    if (!CRPACKSPU_IS_WDDM_CRHGSMI() && !(pack_spu.thread[pack_spu.idxThreadInUse].netServer.conn->actual_network))
+    {
+        crError( "packspu_GenRenderbuffersEXT doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" );
+    }
+    if (pack_spu.swap)
+    {
+        crPackGenRenderbuffersEXTSWAP( n, renderbuffers, &writeback );
+    }
+    else
+    {
+        crPackGenRenderbuffersEXT( n, renderbuffers, &writeback );
+    }
+    packspuFlush( (void *) thread );
+    CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
+
+    crStateRegRenderbuffers(n, renderbuffers);
+}

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -120 +120 @@
 CompressedTexSubImage2DARB
 CompressedTexSubImage3DARB
+GenFramebuffersEXT
+GenRenderbuffersEXT
+GenBuffersARB

trunk/src/VBox/GuestHost/OpenGL/include/cr_hash.h

@@ -27 +27 @@
 DECLEXPORT(void) crHashtableAdd( CRHashTable *h, unsigned long key, void *data );
 DECLEXPORT(GLuint) crHashtableAllocKeys( CRHashTable *h, GLsizei range );
+GLboolean crHashtableAllocRegisterKey( CRHashTable *h,  GLuint key);
 DECLEXPORT(void) crHashtableDelete( CRHashTable *h, unsigned long key, CRHashtableCallback deleteCallback );
 DECLEXPORT(void) crHashtableDeleteBlock( CRHashTable *h, unsigned long key, GLsizei range, CRHashtableCallback deleteFunc );

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

@@ -64 +64 @@
 DECLEXPORT(GLuint) STATE_APIENTRY crStateGetBufferHWID(GLuint id);
 
+DECLEXPORT(void) crStateRegBuffers(GLsizei n, GLuint *buffers);
 #ifdef __cplusplus
 }

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

@@ -97 +97 @@
 DECLEXPORT(GLuint) STATE_APIENTRY crStateRBOHWIDtoID(GLuint hwid);
 
+DECLEXPORT(void) crStateRegFramebuffers(GLsizei n, GLuint *buffers);
+DECLEXPORT(void) crStateRegRenderbuffers(GLsizei n, GLuint *buffers);
+
 #ifdef IN_GUEST
 DECLEXPORT(GLenum) STATE_APIENTRY crStateCheckFramebufferStatusEXT(GLenum target);

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

@@ -34 +34 @@
     CRContext *g = GetCurrentContext();
     crStateGenNames(g, g->shared->buffersTable, n, buffers);
+}
+
+void crStateRegBuffers(GLsizei n, GLuint *buffers)
+{
+    CRContext *g = GetCurrentContext();
+    crStateRegNames(g, g->shared->buffersTable, n, buffers);
 }
 

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

@@ -44 +44 @@
     CRContext *g = GetCurrentContext();
     crStateGenNames(g, g->shared->rbTable, n, buffers);
+}
+
+void crStateRegFramebuffers(GLsizei n, GLuint *buffers)
+{
+    CRContext *g = GetCurrentContext();
+    crStateRegNames(g, g->shared->fbTable, n, buffers);
+}
+
+void crStateRegRenderbuffers(GLsizei n, GLuint *buffers)
+{
+    CRContext *g = GetCurrentContext();
+    crStateRegNames(g, g->shared->rbTable, n, buffers);
 }
 

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

@@ -619 +619 @@
     crStateDeleteTextureObjectData(tobj);
     crFree(tobj);
+}
+
+void crStateRegNames(CRContext *g, CRHashTable *table, GLsizei n, GLuint *names)
+{
+    GLint i;
+    for (i = 0; i < n; i++)
+    {
+        if (names[i])
+        {
+            GLboolean isNewKey = crHashtableAllocRegisterKey(table, names[i]);
+            CRASSERT(isNewKey);
+        }
+        else
+            crWarning("RegNames: requested to register a null name");
+    }
 }
 

trunk/src/VBox/GuestHost/OpenGL/util/hash.c

@@ -236 +236 @@
  * Mark the given Id as being allocated.
  */
-static void crHashIdPoolAllocId( CRHashIdPool *pool, GLuint id )
+static GLboolean crHashIdPoolAllocId( CRHashIdPool *pool, GLuint id )
 {
     FreeElem *f;
@@ -267 +267 @@
                 f->next = newelem;
             }
-            return;
+            return GL_TRUE;
         }
         f = f->next;
@@ -273 +273 @@
 
     /* if we get here, the ID was already allocated - that's OK */
+    return GL_FALSE;
 }
 
@@ -418 +419 @@
 }
 
+GLboolean crHashtableAllocRegisterKey( CRHashTable *h,  GLuint key)
+{
+    GLboolean fAllocated;
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&h->mutex);
+#endif
+    fAllocated = crHashIdPoolAllocId (h->idPool, key);
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&h->mutex);
+#endif
+    return fAllocated;
+}
+
 GLuint crHashtableAllocKeys( CRHashTable *h,  GLsizei range)
 {
@@ -427 +441 @@
 #endif
     res = crHashIdPoolAllocBlock (h->idPool, range);
+#ifdef DEBUG_misha
+    Assert(res);
+    for (i = 0; i < range; ++i)
+    {
+        void *search = crHashtableSearch( h, res+i );
+        Assert(!search);
+    }
+#endif
 #ifdef CHROMIUM_THREADSAFE
     crUnlockMutex(&h->mutex);

trunk/src/VBox/GuestHost/OpenGL/util/util.def

@@ -83 +83 @@
 crHashtableNumElements
 crHashtableWalk
+crHashtableAllocRegisterKey
 crAllocHashtable
 crFreeHashtable