Changeset 51559 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack

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/Additions/common/crOpenGL/pack

Files:

• packspu.h (modified) (1 diff)
• packspu_context.c (modified) (2 diffs)
• packspu_misc.c (modified) (2 diffs)
• packspu_special (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h

@@ -158 +158 @@
 extern ThreadInfo *packspuNewCtxThread( struct VBOXUHGSMI *pHgsmi );
 
+
+
+#define MAGIC_OFFSET 3000
+
 #endif /* CR_PACKSPU_H */

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

@@ -10 +10 @@
 #include "cr_string.h"
 #include "packspu_proto.h"
-
-#define MAGIC_OFFSET 3000
 
 /*
@@ -231 +229 @@
 
     packspu_ChromiumParameteriCR(param, value);
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_PackMutex);
+#endif
+
+    if (CRPACKSPU_IS_WDDM_CRHGSMI())
+    {
+        /* restore the packer context to the tls */
+        crPackSetContext(curPacker);
+    }
+}
+
+GLvoid PACKSPU_APIENTRY
+packspu_VBoxConChromiumParametervCR(GLint con, GLenum target, GLenum type, GLsizei count, const GLvoid *values)
+{
+    GET_THREAD(thread);
+    CRPackContext * curPacker = crPackGetContext();
+    ThreadInfo *curThread = thread;
+    int writeback = 1;
+    GLint serverCtx = (GLint) -1;
+
+    CRASSERT(!curThread == !curPacker);
+    CRASSERT(!curThread || !curPacker || curThread->packer == curPacker);
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_PackMutex);
+#endif
+
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    CRASSERT(!con == !CRPACKSPU_IS_WDDM_CRHGSMI());
+#endif
+
+    if (CRPACKSPU_IS_WDDM_CRHGSMI())
+    {
+        if (!con)
+        {
+            crError("connection should be specified!");
+            return;
+        }
+        thread = GET_THREAD_VAL_ID(con);
+    }
+    else
+    {
+        CRASSERT(!con);
+        if (!thread)
+        {
+            thread = packspuNewThread(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                NULL
+#endif
+                );
+        }
+    }
+    CRASSERT(thread);
+    CRASSERT(thread->packer);
+
+    crPackSetContext( thread->packer );
+
+    packspu_ChromiumParametervCR(target, type, count, values);
 
 #ifdef CHROMIUM_THREADSAFE

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

@@ -15 +15 @@
     CRMessage msg;
     int len;
-    
+    GLint ai32ServerValues[2];
+    GLboolean fFlush = GL_FALSE;
     GET_THREAD(thread);
 
@@ -30 +31 @@
             len = sizeof(CRMessageGather);
             crNetSend(thread->netServer.conn, NULL, &msg, len);
-            break;
-            
+            return;
+
+        case GL_SHARE_LISTS_CR:
+        {
+            ContextInfo *pCtx[2];
+            GLint *ai32Values;
+            int i;
+            if (count != 2)
+            {
+                WARN(("GL_SHARE_LISTS_CR invalid cound %d", count));
+                return;
+            }
+
+            if (type != GL_UNSIGNED_INT && type != GL_INT)
+            {
+                WARN(("GL_SHARE_LISTS_CR invalid type %d", type));
+                return;
+            }
+
+            ai32Values = (GLint*)values;
+
+            for (i = 0; i < 2; ++i)
+            {
+                const int slot = ai32Values[i] - MAGIC_OFFSET;
+
+                if (slot < 0 || slot >= pack_spu.numContexts)
+                {
+                    WARN(("GL_SHARE_LISTS_CR invalid value[%d] %d", i, ai32Values[i]));
+                    return;
+                }
+
+                pCtx[i] = &pack_spu.context[slot];
+                if (!pCtx[i]->clientState)
+                {
+                    WARN(("GL_SHARE_LISTS_CR invalid pCtx1 for value[%d] %d", i, ai32Values[i]));
+                    return;
+                }
+
+                ai32ServerValues[i] = pCtx[i]->serverCtx;
+            }
+
+            crStateShareLists(pCtx[0]->clientState, pCtx[1]->clientState);
+
+            values = ai32ServerValues;
+
+            fFlush = GL_TRUE;
+
+            break;
+        }
+
         default:
-            if (pack_spu.swap)
-                crPackChromiumParametervCRSWAP(target, type, count, values);
-            else
-                crPackChromiumParametervCR(target, type, count, values);
-    }
-
-
+            break;
+    }
+
+    if (pack_spu.swap)
+        crPackChromiumParametervCRSWAP(target, type, count, values);
+    else
+        crPackChromiumParametervCR(target, type, count, values);
+
+    if (fFlush)
+        packspuFlush( (void *) thread );
 }
 

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

@@ -111 +111 @@
 VBoxCreateContext
 VBoxConChromiumParameteriCR
+VBoxConChromiumParametervCR
 VBoxWindowCreate
 VBoxWindowDestroy