Changeset 19099 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Apr 22, 2009 9:13:20 AM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: fix multicontext crashes (public bug #3762)

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• feedback/feedback_context.c (added)
• feedback/feedback_state.py (modified) (1 diff)
• feedback/feedback_state_special (modified) (1 diff)
• feedback/feedbackspu.h (modified) (2 diffs)
• feedback/feedbackspu_init.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -398 +398 @@
         feedback/feedbackspu_config.c \
         feedback/feedbackspu_init.c \
+        feedback/feedback_context.c \
         $(VBOX_PATH_CROGL_GENFILES)/feedbackspu.c \
         $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_state.c

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedback_state.py

@@ -16 +16 @@
 #include "feedbackspu_proto.h"
 """
+custom = ["CreateContext", "MakeCurrent", "DestroyContext"]
 
 keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
 
 for func_name in keys:
-        if apiutil.FindSpecial( "feedback_state", func_name ):
-                return_type = apiutil.ReturnType(func_name)
-                params = apiutil.Parameters(func_name)
-                print '%s FEEDBACKSPU_APIENTRY feedbackspu_%s( %s )' % (return_type, func_name, apiutil.MakeDeclarationString(params))
-                print '{'
-                print '\tcrState%s( %s );' % (func_name, apiutil.MakeCallString(params))
-                print ''
-                print '\tfeedback_spu.super.%s( %s );' % (func_name, apiutil.MakeCallString(params))
-                print '}'
+    if apiutil.FindSpecial( "feedback_state", func_name ):
+        if func_name in custom:
+            continue
+        return_type = apiutil.ReturnType(func_name)
+        params = apiutil.Parameters(func_name)
+        print '%s FEEDBACKSPU_APIENTRY feedbackspu_%s( %s )' % (return_type, func_name, apiutil.MakeDeclarationString(params))
+        print '{'
+        print '\tcrState%s( %s );' % (func_name, apiutil.MakeCallString(params))
+        print ''
+        print '\tfeedback_spu.super.%s( %s );' % (func_name, apiutil.MakeCallString(params))
+        print '}'

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedback_state_special

@@ -59 +59 @@
 RasterPos4s
 RasterPos4sv
+CreateContext
+MakeCurrent
+DestroyContext

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.h

@@ -18 +18 @@
 #include "cr_glstate.h"
 
+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;
@@ -28 +35 @@
 
         CRCurrentStatePointers current;
+
+    CRContext *defaultctx;
+    int numContexts;
+    ContextInfo context[CR_MAX_CONTEXTS];
+
+#ifdef CHROMIUM_THREADSAFE
+    CRmutex mutex;
+#endif
 } feedbackSPU;
 

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu_init.c

@@ -33 +33 @@
         (void) num_contexts;
 
+#ifdef CHROMIUM_THREADSAFE
+    crInitMutex(&feedback_spu.mutex);
+#endif
+
         feedback_spu.id = id;
         feedback_spu.has_child = 0;
@@ -47 +51 @@
         /* create/init default state tracker */
         crStateInit();
-        ctx = crStateGetCurrent();
-        CRASSERT(ctx);
-        crStateSetCurrentPointers(ctx, &feedback_spu.current);
+
+    feedback_spu.defaultctx = crStateCreateContext(NULL, 0, NULL);
+    crStateSetCurrent(feedback_spu.defaultctx);
+
+    feedback_spu.numContexts = 0;
+    crMemZero(feedback_spu.context, CR_MAX_CONTEXTS * sizeof(ContextInfo));
 
         return &feedback_functions;