Changeset 51559 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Jun 5, 2014 9:18:41 PM (11 years ago)

Author:

vboxsync

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

94217

Message:

crOpenGL: wglShareLists support

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• glapi_parser/APIspec.txt (modified) (1 diff)
• include/chromium.h (modified) (1 diff)
• include/cr_glstate.h (modified) (2 diffs)
• state_tracker/state_init.c (modified) (6 diffs)

trunk/src/VBox/GuestHost/OpenGL/glapi_parser/APIspec.txt

@@ -8571 +8571 @@
 chromium    nopack
 
+name        VBoxConChromiumParametervCR
+return      void
+param       con         GLint
+param       target      GLenum
+paramprop   target      GL_CURSOR_POSITION_CR GL_DEFAULT_BBOX_CR GL_SCREEN_BBOX_CR GL_OBJECT_BBOX_CR GL_PRINT_STRING_CR GL_MURAL_SIZE_CR GL_NUM_SERVERS_CR GL_NUM_TILES_CR GL_TILE_BOUNDS_CR GL_VERTEX_COUNTS_CR GL_RESET_VERTEX_COUNTERS_CR GL_SET_MAX_VIEWPORT_CR GL_HEAD_SPU_NAME_CR GL_PERF_GET_FRAME_DATA_CR GL_PERF_GET_TIMER_DATA_CR GL_PERF_DUMP_COUNTERS_CR GL_PERF_SET_TOKEN_CR GL_PERF_SET_DUMP_ON_SWAP_CR GL_PERF_SET_DUMP_ON_FINISH_CR GL_PERF_SET_DUMP_ON_FLUSH_CR GL_PERF_START_TIMER_CR GL_PERF_STOP_TIMER_CR GL_WINDOW_SIZE_CR GL_TILE_INFO_CR GL_GATHER_DRAWPIXELS_CR GL_GATHER_PACK_CR GL_GATHER_CONNECT_CR GL_GATHER_POST_SWAPBUFFERS_CR GL_SAVEFRAME_ENABLED_CR GL_SAVEFRAME_FRAMENUM_CR GL_SAVEFRAME_STRIDE_CR GL_SAVEFRAME_SINGLE_CR GL_SAVEFRAME_FILESPEC_CR GL_READBACK_BARRIER_SIZE_CR
+param       type        GLenum
+paramprop   type        GL_BYTE GL_UNSIGNED_BYTE GL_SHORT GL_UNSIGNED_SHORT GL_INT GL_UNSIGNED_INT GL_FLOAT GL_DOUBLE
+param       count       GLsizei
+param       values      const GLvoid *
+category    VBox
+props       nolist
+chromium    nopack
+
+
 name        VBoxWindowCreate
 return      GLint

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

@@ -734 +734 @@
 #define GL_CHECK_ZERO_VERT_ARRT       0x8B30
 
+/* share lists */
+#define GL_SHARE_LISTS_CR             0x8B31
+
 /**********************************************************************/
 /*****                Chromium-specific API                       *****/

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

@@ -116 +116 @@
     CRHashTable *rbTable;       /* render buffers */
 
-    GLint refCount;
+    volatile int32_t refCount;
     GLint id;                   /*unique shared state id, it's not always matching some existing context id!*/
     GLint saveCount;
@@ -308 +308 @@
 
 DECLEXPORT(void) STATE_APIENTRY crStateShareContext(GLboolean value);
+DECLEXPORT(void) STATE_APIENTRY crStateShareLists(CRContext *pContext1, CRContext *pContext2);
 DECLEXPORT(void) STATE_APIENTRY crStateSetSharedContext(CRContext *pCtx);
 DECLEXPORT(GLboolean) STATE_APIENTRY crStateContextIsShared(CRContext *pCtx);

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

@@ -9 +9 @@
 #include "cr_error.h"
 #include "cr_spu.h"
+
+#include <iprt/asm.h>
 
 #ifdef CHROMIUM_THREADSAFE
@@ -110 +112 @@
 crStateFreeShared(CRContext *pContext, CRSharedState *s)
 {
-    s->refCount--;
-    Assert(s->refCount >= 0);
-    if (s->refCount <= 0) {
+    int32_t refCount = ASMAtomicDecS32(&s->refCount);
+
+    Assert(refCount >= 0);
+    if (refCount <= 0) {
         if (s==gSharedState)
         {
@@ -144 +147 @@
         return NULL;
     }
-    gSharedState->refCount++;
+    ASMAtomicIncS32(&gSharedState->refCount);
     return gSharedState;
 }
@@ -176 +179 @@
             crStateFreeShared(pCtx, pCtx->shared);
             pCtx->shared = gSharedState;
-            gSharedState->refCount++;
+            ASMAtomicIncS32(&gSharedState->refCount);
         }
     }
@@ -199 +202 @@
         }
     }
+}
+
+DECLEXPORT(void) STATE_APIENTRY
+crStateShareLists(CRContext *pContext1, CRContext *pContext2)
+{
+    CRASSERT(pContext1->shared);
+    CRASSERT(pContext2->shared);
+
+    if (pContext2->shared == pContext1->shared)
+    {
+        return;
+    }
+
+    crStateFreeShared(pContext1, pContext1->shared);
+    pContext1->shared = pContext2->shared;
+    ASMAtomicIncS32(&pContext2->shared->refCount);
 }
 
@@ -271 +290 @@
         CRASSERT(shareCtx->shared);
         ctx->shared = shareCtx->shared;
-        ctx->shared->refCount ++;
+        ASMAtomicIncS32(&ctx->shared->refCount);
     }
     else {