Changeset 16074 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 20, 2009 10:00:38 AM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: fix guest app crashes with vertexarrays for multithreaded apps

Location:

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/array

Files:

• arrayspu.c (modified) (7 diffs)
• arrayspu.h (modified) (1 diff)
• arrayspu_init.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/array/arrayspu.c

@@ -13 +13 @@
 ArraySPU array_spu;
 
+#ifdef CHROMIUM_THREADSAFE
+CRmutex _ArrayMutex;
+#endif
+
 static void ARRAYSPU_APIENTRY arrayspu_ArrayElement( GLint index )
 {
-    const CRClientState *c = &(array_spu.ctx->client);
+    const CRClientState *c = &(crStateGetCurrent()->client);
     const CRVertexArrays *array = &(c->array);
-    const GLboolean vpEnabled = array_spu.ctx->program.vpEnabled;
+    const GLboolean vpEnabled = crStateGetCurrent()->program.vpEnabled;
     unsigned char *p;
     unsigned int unit, attr;
@@ -103 +107 @@
 
     /* Now do conventional arrays, unless overriden by generic arrays above */
-    for (unit = 0 ; unit < array_spu.ctx->limits.maxTextureUnits ; unit++)
+    for (unit = 0 ; unit < crStateGetCurrent()->limits.maxTextureUnits ; unit++)
     {
         if (array->t[unit].enabled && !(vpEnabled && array->a[VERT_ATTRIB_TEX0+unit].enabled))
@@ -450 +454 @@
     GLubyte *p = (GLubyte *)indices;
 #ifdef CR_ARB_vertex_buffer_object
-    CRBufferObject *elementsBuffer = array_spu.ctx->bufferobject.elementsBuffer;
+    CRBufferObject *elementsBuffer = crStateGetCurrent()->bufferobject.elementsBuffer;
 #endif
 
@@ -622 +626 @@
 {
      if (cap == GL_VERTEX_PROGRAM_NV) {
-            array_spu.ctx->program.vpEnabled = GL_TRUE;
+            crStateGetCurrent()->program.vpEnabled = GL_TRUE;
      }
      array_spu.child.Enable(cap);
@@ -631 +635 @@
 {
      if (cap == GL_VERTEX_PROGRAM_NV) {
-            array_spu.ctx->program.vpEnabled = GL_FALSE;
+            crStateGetCurrent()->program.vpEnabled = GL_FALSE;
      }
      array_spu.child.Disable(cap);
@@ -754 +758 @@
 }
 
+static GLint ARRAYSPU_APIENTRY
+arrayspu_CreateContext( const char *dpyName, GLint visual, GLint shareCtx )
+{
+    GLint ctx, slot;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_ArrayMutex);
+#endif
+
+    ctx = array_spu.child.CreateContext(dpyName, visual, shareCtx);
+
+    /* find an empty context slot */
+    for (slot = 0; slot < array_spu.numContexts; slot++) {
+        if (!array_spu.context[slot].clientState) {
+            /* found empty slot */
+            break;
+        }
+    }
+    if (slot == array_spu.numContexts) {
+        array_spu.numContexts++;
+    }
+
+    array_spu.context[slot].clientState = crStateCreateContext(NULL, visual, NULL);
+    array_spu.context[slot].clientCtx = ctx;
+#ifdef CR_ARB_vertex_buffer_object
+    array_spu.context[slot].clientState->bufferobject.retainBufferData = GL_TRUE;
+#endif
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_ArrayMutex);
+#endif
+
+    return ctx;
+}
+
+static void ARRAYSPU_APIENTRY
+arrayspu_MakeCurrent( GLint window, GLint nativeWindow, GLint ctx )
+{
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_ArrayMutex);
+#endif
+    array_spu.child.MakeCurrent(window, nativeWindow, ctx);
+
+    if (ctx) {
+        int slot;
+
+        for (slot=0; slot<array_spu.numContexts; ++slot)
+            if (array_spu.context[slot].clientCtx == ctx) break;
+        CRASSERT(slot < array_spu.numContexts);
+
+        crStateMakeCurrent(array_spu.context[slot].clientState);
+    }
+    else 
+    {
+        crStateMakeCurrent(NULL);
+    }
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_ArrayMutex);
+#endif
+}
+
+static void ARRAYSPU_APIENTRY
+arrayspu_DestroyContext( GLint ctx )
+{
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_ArrayMutex);
+#endif
+    array_spu.child.DestroyContext(ctx);
+
+    if (ctx) {
+        int slot;
+
+        for (slot=0; slot<array_spu.numContexts; ++slot)
+            if (array_spu.context[slot].clientCtx == ctx) break;
+        CRASSERT(slot < array_spu.numContexts);
+
+        crStateDestroyContext(array_spu.context[slot].clientState);
+
+        array_spu.context[slot].clientState = NULL;
+        array_spu.context[slot].clientCtx = 0;
+    }
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_ArrayMutex);
+#endif
+}
 
 SPUNamedFunctionTable _cr_array_table[] = {
@@ -793 +884 @@
     { "GetBufferPointervARB", (SPUGenericFunction) arrayspu_GetBufferPointervARB},
     { "InterleavedArrays", (SPUGenericFunction) arrayspu_InterleavedArrays},
+    { "CreateContext", (SPUGenericFunction) arrayspu_CreateContext},
+    { "MakeCurrent", (SPUGenericFunction) arrayspu_MakeCurrent},
+    { "DestroyContext", (SPUGenericFunction) arrayspu_DestroyContext},
     { NULL, NULL }
 };

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/array/arrayspu.h

@@ -19 +19 @@
 void arrayspuSetVBoxConfiguration( void );
 
+typedef struct context_info_t ContextInfo;
+
+struct context_info_t {
+    CRContext *clientState;  /* used to store client-side GL state */
+    GLint clientCtx;         /* client context ID */
+};
+
 typedef struct {
     int id;
     int has_child;
-    CRContext *ctx;
+    CRContext *defaultctx;
     SPUDispatchTable self, child, super;
+    int numContexts;
+    ContextInfo context[CR_MAX_CONTEXTS];
 } ArraySPU;
 
 extern ArraySPU array_spu;
 
+#ifdef CHROMIUM_THREADSAFE
+extern CRmutex _ArrayMutex;
+#endif
+
 #endif /* ARRAY_SPU_H */

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/array/arrayspu_init.c

@@ -7 +7 @@
 #include "cr_spu.h"
 #include "arrayspu.h"
+#include "cr_mem.h"
 #include <stdio.h>
 
@@ -27 +28 @@
     (void) num_contexts;
 
+#ifdef CHROMIUM_THREADSAFE
+    crInitMutex(&_ArrayMutex);
+#endif
+
     array_spu.id = id;
     array_spu.has_child = 0;
@@ -40 +45 @@
 
     crStateInit();
-    array_spu.ctx = crStateCreateContext( NULL, 0, NULL );
+/*@todo seems default context ain't needed at all*/
+    array_spu.defaultctx = crStateCreateContext( NULL, 0, NULL );
 #ifdef CR_ARB_vertex_buffer_object
-    array_spu.ctx->bufferobject.retainBufferData = GL_TRUE;
+    array_spu.defaultctx->bufferobject.retainBufferData = GL_TRUE;
 #endif
     /* we call SetCurrent instead of MakeCurrent as the differencer
      * isn't setup yet anyway */
-    crStateSetCurrent( array_spu.ctx );
+    crStateSetCurrent( array_spu.defaultctx );
+
+    array_spu.numContexts = 0;
+    crMemZero(array_spu.context, CR_MAX_CONTEXTS * sizeof(ContextInfo));
 
     return &array_functions;