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

Timestamp:

Aug 4, 2014 12:01:31 PM (11 years ago)

Author:

vboxsync

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

95359

Message:

CrOpenGL: GetString inside DisplayLists

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/common/crOpenGL/pack/packspu.h (modified) (1 diff)
• src/VBox/Additions/common/crOpenGL/pack/packspu_context.c (modified) (1 diff)
• src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c (modified) (4 diffs)

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

@@ -162 +162 @@
 extern void packspuHuge( CROpcode opcode, void *buf );
 
+extern void packspuInitStrings();
+
 extern GLboolean packspuSyncOnFlushes();
 

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

@@ -595 +595 @@
         crPackMakeCurrent( window, nativeWindow, serverCtx );
 
+    if (serverCtx)
+    {
+        packspuInitStrings();
+    }
+
     {
         GET_THREAD(t);

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

@@ -35 +35 @@
 GetVersionString(void)
 {
-    GLubyte return_value[100];
-    GLfloat version;
-
-    GetString(GL_VERSION, return_value);
-    CRASSERT(crStrlen((char *)return_value) < 100);
-
-    version = crStrToFloat((char *) return_value);
-    version = crStateComputeVersion(version);
+    static GLboolean fInitialized = GL_FALSE;
+    static GLfloat version = 0.;
+
+    if (!fInitialized)
+    {
+        GLubyte return_value[100];
+
+        GetString(GL_VERSION, return_value);
+        CRASSERT(crStrlen((char *)return_value) < 100);
+
+        version = crStrToFloat((char *) return_value);
+        version = crStateComputeVersion(version);
+
+        fInitialized = GL_TRUE;
+    }
 
     return version;
@@ -50 +57 @@
 GetExtensions(void)
 {
-    GLubyte return_value[10*1000];
-    const GLubyte *extensions, *ext;
-    GET_THREAD(thread);
-    int writeback = 1;
-
-    if (pack_spu.swap)
-    {
-        crPackGetStringSWAP( GL_EXTENSIONS, return_value, &writeback );
-    }
-    else
-    {
-        crPackGetString( GL_EXTENSIONS, return_value, &writeback );
-    }
-    packspuFlush( (void *) thread );
-
-    CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
-
-    CRASSERT(crStrlen((char *)return_value) < 10*1000);
-
-    /* OK, we got the result from the server.  Now we have to
-     * intersect is with the set of extensions that Chromium understands
-     * and tack on the Chromium-specific extensions.
-     */
-    extensions = return_value;
-    ext = crStateMergeExtensions(1, &extensions);
+    static GLboolean fInitialized = GL_FALSE;
+    if (!fInitialized)
+    {
+        GLubyte return_value[10*1000];
+        const GLubyte *extensions, *ext;
+        GET_THREAD(thread);
+        int writeback = 1;
+
+        if (pack_spu.swap)
+        {
+            crPackGetStringSWAP( GL_EXTENSIONS, return_value, &writeback );
+        }
+        else
+        {
+            crPackGetString( GL_EXTENSIONS, return_value, &writeback );
+        }
+        packspuFlush( (void *) thread );
+
+        CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
+
+        CRASSERT(crStrlen((char *)return_value) < 10*1000);
+
+        /* OK, we got the result from the server.  Now we have to
+         * intersect is with the set of extensions that Chromium understands
+         * and tack on the Chromium-specific extensions.
+         */
+        extensions = return_value;
+        ext = crStateMergeExtensions(1, &extensions);
 
 #ifdef Linux
-    /*@todo 
-     *That's a hack to allow running Unity, it uses libnux which is calling extension functions
-     *without checking if it's being supported/exported.
-     *glActiveStencilFaceEXT seems to be actually supported but the extension string isn't exported (for ex. on ATI HD4870),
-     *which leads to libglew setting function pointer to NULL and crashing Unity.
-     */
-    sprintf((char*)gpszExtensions, "%s GL_EXT_stencil_two_side", ext);
+        /*@todo
+         *That's a hack to allow running Unity, it uses libnux which is calling extension functions
+         *without checking if it's being supported/exported.
+         *glActiveStencilFaceEXT seems to be actually supported but the extension string isn't exported (for ex. on ATI HD4870),
+         *which leads to libglew setting function pointer to NULL and crashing Unity.
+         */
+        sprintf((char*)gpszExtensions, "%s GL_EXT_stencil_two_side", ext);
 #else
-    sprintf((char*)gpszExtensions, "%s", ext);
-#endif
+        sprintf((char*)gpszExtensions, "%s", ext);
+#endif
+        fInitialized = GL_TRUE;
+    }
 
     return gpszExtensions;
@@ -161 +173 @@
 #ifdef CR_OPENGL_VERSION_2_0
         case GL_SHADING_LANGUAGE_VERSION:
-            GetString(GL_SHADING_LANGUAGE_VERSION, gpszShadingVersion);
+        {
+            static GLboolean fInitialized = GL_FALSE;
+            if (!fInitialized)
+            {
+                GetString(GL_SHADING_LANGUAGE_VERSION, gpszShadingVersion);
+                fInitialized = GL_TRUE;
+            }
             return gpszShadingVersion;
+        }
 #endif
 #ifdef GL_CR_real_vendor_strings
@@ -179 +198 @@
     }
 }
+
+void packspuInitStrings()
+{
+    static GLboolean fInitialized = GL_FALSE;
+
+    if (!fInitialized)
+    {
+        packspu_GetString(GL_EXTENSIONS);
+        packspu_GetString(GL_VERSION);
+        fInitialized = GL_TRUE;
+    }
+}