Changeset 44908 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Mar 4, 2013 11:16:25 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: work around context destruction ogl driver bug

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (5 diffs)
• renderspu.h (modified) (2 diffs)
• renderspu_init.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -13 +13 @@
 #include "renderspu.h"
 #include "cr_extstring.h"
+
+#include <iprt/asm.h>
 
 
@@ -180 +182 @@
     */
 
+    if (sharedContext)
+        ASMAtomicIncU32(&sharedContext->cRefs);
+    context->cRefs = 1;
+
     return context;
 }
@@ -209 +215 @@
 }
 
+static uint32_t renderspuContextRelease( ContextInfo *context );
+static void renderspuDestroyContextTerminate( ContextInfo *context )
+{
+    CRASSERT(context->BltInfo.Base.id == -1);
+    renderspu_SystemDestroyContext( context );
+    if (context->extensionString) {
+        crFree(context->extensionString);
+        context->extensionString = NULL;
+    }
+
+    if (context->shared)
+        renderspuContextRelease( context->shared );
+
+    crFree(context);
+}
+
+static uint32_t renderspuContextRelease( ContextInfo *context )
+{
+    uint32_t cRefs = ASMAtomicDecU32(&context->cRefs);
+    if (!cRefs)
+        renderspuDestroyContextTerminate( context );
+    else
+        CRASSERT(cRefs < UINT32_MAX/2);
+    return cRefs;
+}
+
+uint32_t renderspuContextMarkDeletedAndRelease( ContextInfo *context )
+{
+    /* invalidate the context id to mark it as deleted */
+    context->BltInfo.Base.id = -1;
+
+    /* some drivers do not like when the base (shared) context is deleted before its referals,
+     * this is why we keep a context refference counting the base (shared) context will be destroyed as soon as*/
+    return renderspuContextRelease( context );
+}
+
 static void RENDER_APIENTRY
 renderspuDestroyContext( GLint ctx )
@@ -224 +266 @@
     context = (ContextInfo *) crHashtableSearch(render_spu.contextTable, ctx);
     CRASSERT(context);
+    {
+        if (!context)
+        {
+            crWarning("request to delete inexistent context");
+            return;
+        }
+    }
 
     curCtx = GET_CONTEXT_VAL();
@@ -235 +284 @@
     }
 
-    renderspu_SystemDestroyContext( context );
-    if (context->extensionString) {
-        crFree(context->extensionString);
-        context->extensionString = NULL;
-    }
-    crHashtableDelete(render_spu.contextTable, ctx, crFree);
+    crHashtableDelete(render_spu.contextTable, ctx, NULL);
+
+    renderspuContextMarkDeletedAndRelease(context);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -168 +168 @@
     struct _ContextInfo *shared;
     char *extensionString;
+    volatile uint32_t cRefs;
 } ContextInfo;
 
@@ -416 +417 @@
 extern void RENDER_APIENTRY renderspuSwapBuffers( GLint window, GLint flags );
 
+extern uint32_t renderspuContextMarkDeletedAndRelease( ContextInfo *context );
+
 #ifdef __cplusplus
 extern "C" {

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -411 +411 @@
 {
     ContextInfo *context = (ContextInfo *) data;
-    renderspu_SystemDestroyContext(context);
-    crFree(context);
+    renderspuContextMarkDeletedAndRelease(context);
 }