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

Timestamp:

Jun 24, 2010 6:51:20 PM (15 years ago)

Author:

vboxsync

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

63086

Message:

crOpenGL: wddm friendly windows info tracking + more consistent updates (disabled except windows yet)

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• glapi_parser/APIspec.txt (modified) (1 diff)
• glapi_parser/apiutil.py (modified) (1 diff)
• include/cr_net.h (modified) (1 diff)
• state_tracker/state_init.c (modified) (1 diff)
• util/vboxhgcm.c (modified) (3 diffs)

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

@@ -8500 +8500 @@
 chromium    extpack
 
+name        VBoxPackSetInjectThread
+return      void
+category    VBox
+chromium    nopack
+
+name        VBoxPackGetInjectID
+return      GLuint
+category    VBox
+chromium    nopack
+
+name        VBoxPackSetInjectID
+return      void
+param       id          GLuint
+category    VBox
+chromium    nopack
 
 # OpenGL 1.5

trunk/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py

@@ -353 +353 @@
                 cat == "1.2" or
                 cat == "Chromium" or
-                cat == "GL_chromium"):
+                cat == "GL_chromium" or
+                cat == "VBox"):
                 return ''
         elif (cat == '1.3' or

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

@@ -220 +220 @@
     uint32_t cbHostBufferAllocated;
     uint32_t cbHostBuffer;
+#ifdef IN_GUEST
+    uint32_t u32InjectClientID;
+#endif
     /* Used on host side to indicate that we are not allowed to store above pointers for later use
      * in crVBoxHGCMReceiveMessage. As those messages are going to be processed after the correspoding 

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

@@ -232 +232 @@
          * Ensures context bits are reset */
         crStateFreeContext(defaultContext);
+#ifdef CHROMIUM_THREADSAFE
+        crSetTSD(&__contextTSD, NULL);
+#else
+        __currentContext = NULL;
+#endif
     }
 

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -331 +331 @@
 static void crVBoxHGCMWriteExact(CRConnection *conn, const void *buf, unsigned int len)
 {
-    CRVBOXHGCMWRITE parms;
     int rc;
-
-    parms.hdr.result      = VERR_WRONG_ORDER;
-    parms.hdr.u32ClientID = conn->u32ClientID;
-    parms.hdr.u32Function = SHCRGL_GUEST_FN_WRITE;
-    parms.hdr.cParms      = SHCRGL_CPARMS_WRITE;
-
-    parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
-    parms.pBuffer.u.Pointer.size         = len;
-    parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) buf;
-
-    rc = crVBoxHGCMCall(&parms, sizeof(parms));
-
-    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
-    {
-        crWarning("SHCRGL_GUEST_FN_WRITE failed with %x %x\n", rc, parms.hdr.result);
+    int32_t callRes;
+
+#ifdef IN_GUEST
+    if (conn->u32InjectClientID)
+    {
+        CRVBOXHGCMINJECT parms;
+
+        parms.hdr.result      = VERR_WRONG_ORDER;
+        parms.hdr.u32ClientID = conn->u32ClientID;
+        parms.hdr.u32Function = SHCRGL_GUEST_FN_INJECT;
+        parms.hdr.cParms      = SHCRGL_CPARMS_INJECT;
+
+        parms.u32ClientID.type       = VMMDevHGCMParmType_32bit;
+        parms.u32ClientID.u.value32  = conn->u32InjectClientID;
+
+        parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
+        parms.pBuffer.u.Pointer.size         = len;
+        parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) buf;
+
+        rc = crVBoxHGCMCall(&parms, sizeof(parms));
+        callRes = parms.hdr.result;
+    }
+    else
+#endif
+    {
+        CRVBOXHGCMWRITE parms;
+
+        parms.hdr.result      = VERR_WRONG_ORDER;
+        parms.hdr.u32ClientID = conn->u32ClientID;
+        parms.hdr.u32Function = SHCRGL_GUEST_FN_WRITE;
+        parms.hdr.cParms      = SHCRGL_CPARMS_WRITE;
+
+        parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
+        parms.pBuffer.u.Pointer.size         = len;
+        parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) buf;
+
+        rc = crVBoxHGCMCall(&parms, sizeof(parms));
+        callRes = parms.hdr.result;
+    }
+
+    if (RT_FAILURE(rc) || RT_FAILURE(callRes))
+    {
+        crWarning("SHCRGL_GUEST_FN_WRITE failed with %x %x\n", rc, callRes);
     }
 }
@@ -476 +503 @@
             _crVBoxHGCMWriteBytes(conn, start, len);
 #else
+            CRASSERT(!conn->u32InjectClientID);
             crDebug("SHCRGL: sending userbuf with %d bytes\n", len);
             crVBoxHGCMWriteReadExact(conn, start, len, CR_VBOXHGCM_USERALLOCATED);
@@ -493 +521 @@
      * No need to prepend it to the buffer
      */
+#ifdef IN_GUEST
+    if (conn->u32InjectClientID)
+    {
+        crVBoxHGCMWriteExact(conn, start, len);
+    }
+    else
+#endif
     crVBoxHGCMWriteReadExact(conn, start, len, hgcm_buffer->kind);