Changeset 20411 in vbox

Timestamp:

Jun 8, 2009 2:38:19 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: allow wine to query real host gpu vendor/version/renderer strings (public #3541)

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu.h (modified) (1 diff)
• Additions/common/crOpenGL/pack/packspu_getstring.c (modified) (3 diffs)
• GuestHost/OpenGL/include/chromium.h (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu.c (modified) (1 diff)

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

@@ -41 +41 @@
     GLint serverCtx;         /* context ID returned by server */
     char glVersion[100];     /* GL_VERSION string */
+    char pszRealVendor[100];
+    char pszRealVersion[100];
+    char pszRealRenderer[100];
 };
 

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

@@ -60 +60 @@
 }
 
+static void GetString(GLenum name, char *pszStr)
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    if (pack_spu.swap)
+        crPackGetStringSWAP(name, pszStr, &writeback);
+    else
+        crPackGetString(name, pszStr, &writeback);
+    packspuFlush( (void *) thread );
+
+    while (writeback)
+        crNetRecv();
+}
 
 static GLfloat
@@ -65 +79 @@
 {
     GLubyte return_value[100];
-    GET_THREAD(thread);
     int writeback = 1;
     GLfloat version;
 
-    if (pack_spu.swap)
-        crPackGetStringSWAP( GL_VERSION, return_value, &writeback );
-    else
-        crPackGetString( GL_VERSION, return_value, &writeback );
-    packspuFlush( (void *) thread );
-
-    while (writeback)
-        crNetRecv();
-
+    GetString(GL_VERSION, return_value);
     CRASSERT(crStrlen((char *)return_value) < 100);
 
@@ -86 +91 @@
 }
 
+#ifdef WINDOWS
+static bool packspuRunningUnderWine(void)
+{
+    return NULL != GetModuleHandle("wined3d.dll");
+}
+#endif
+
 const GLubyte * PACKSPU_APIENTRY packspu_GetString( GLenum name )
 {
     GET_CONTEXT(ctx);
 
-    if (name == GL_EXTENSIONS)
+    switch(name)
     {
-        return GetExtensions();
-    }
-    else if (name == GL_VERSION)
-    {
-        float version = GetVersionString();
-        sprintf(ctx->glVersion, "%.1f Chromium %s", version, CR_VERSION_STRING);
-        return (const GLubyte *) ctx->glVersion;
-    }
+        case GL_EXTENSIONS:
+            return GetExtensions();
+        case GL_VERSION:
+#ifdef WINDOWS
+            if (packspuRunningUnderWine())
+            {
+                GetString(GL_REAL_VERSION, ctx->pszRealVersion);
+                return (const GLubyte*) ctx->pszRealVersion;               
+            }
+            else
+#endif
+            {
+                float version = GetVersionString();
+                sprintf(ctx->glVersion, "%.1f Chromium %s", version, CR_VERSION_STRING);
+                return (const GLubyte *) ctx->glVersion;
+            }
+        case GL_VENDOR:
+#ifdef WINDOWS
+            if (packspuRunningUnderWine())
+            {
+                GetString(GL_REAL_VENDOR, ctx->pszRealVendor);
+                return (const GLubyte*) ctx->pszRealVendor;
+            }
+            else
+#endif
+            {
+                return crStateGetString(name);
+            }
+        case GL_RENDERER:
+#ifdef WINDOWS
+            if (packspuRunningUnderWine())
+            {
+                GetString(GL_REAL_RENDERER, ctx->pszRealRenderer);
+                return (const GLubyte*) ctx->pszRealRenderer;
+            }
+            else
+#endif
+            {
+                return crStateGetString(name);
+            }
+
 #ifdef CR_OPENGL_VERSION_2_0
-    else if (name == GL_SHADING_LANGUAGE_VERSION)
-    {
-        GET_THREAD(thread);
-        int writeback = 1;
-
-        crPackGetString(GL_SHADING_LANGUAGE_VERSION, gpszShadingVersion, &writeback);
-        packspuFlush( (void *) thread );
-
-        while (writeback)
-            crNetRecv();
-
-        return gpszShadingVersion;
-    }
+        case GL_SHADING_LANGUAGE_VERSION:
+            GetString(GL_SHADING_LANGUAGE_VERSION, gpszShadingVersion);
+            return gpszShadingVersion;
 #endif
-    else
-    {
-        return crStateGetString(name);
+#ifdef GL_CR_real_vendor_strings
+        case GL_REAL_VENDOR:
+            GetString(GL_REAL_VENDOR, ctx->pszRealVendor);
+            return (const GLubyte*) ctx->pszRealVendor;
+        case GL_REAL_VERSION:
+            GetString(GL_REAL_VERSION, ctx->pszRealVersion);
+            return (const GLubyte*) ctx->pszRealVersion;
+        case GL_REAL_RENDERER:
+            GetString(GL_REAL_RENDERER, ctx->pszRealRenderer);
+            return (const GLubyte*) ctx->pszRealRenderer;
+#endif
+        default:
+            return crStateGetString(name);
     }
 }

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

@@ -545 +545 @@
 #endif /* GL_CR_zpix */
 
+/*Allow to use glGetString to query real host GPU info*/
+#ifndef GL_CR_real_vendor_strings
+#define GL_CR_real_vendor_strings 1
+#define GL_REAL_VENDOR   0x8B23
+#define GL_REAL_VERSION  0x8B24
+#define GL_REAL_RENDERER 0x8B25
+#endif
+
 
 /**********************************************************************/
@@ -618 +626 @@
 #endif
 
-
 #ifdef __cplusplus
 }

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

@@ -1000 +1000 @@
         return render_spu.ws.glGetString(GL_SHADING_LANGUAGE_VERSION);
 #endif
+#ifdef GL_CR_real_vendor_strings
+    else if (pname == GL_REAL_VENDOR)
+        return render_spu.ws.glGetString(GL_VENDOR);
+    else if (pname == GL_REAL_VERSION)
+        return render_spu.ws.glGetString(GL_VERSION);
+    else if (pname == GL_REAL_RENDERER)
+        return render_spu.ws.glGetString(GL_RENDERER);
+#endif
     else
         return NULL;