Changeset 40480 in vbox for trunk

Timestamp:

Mar 15, 2012 2:18:14 PM (13 years ago)

Author:

vboxsync

Message:

wined3d: build log bugfix, max_uniforms tmp workaround for win8

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• directx.c (modified) (2 diffs)
• glsl_shader.c (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

@@ -2498 +2498 @@
         glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max);
         gl_info->limits.glsl_vs_float_constants = gl_max / 4;
+#ifdef VBOX_WITH_WDDM
+        /* AFAICT the " / 4" here comes from that we're going to use the glsl_vs/ps_float_constants to create vec4 arrays,
+         * thus each array element has 4 components, so the actual number of vec4 arrays is GL_MAX_VERTEX/FRAGMENT_UNIFORM_COMPONENTS_ARB / 4
+         * win8 Aero won't properly work with this constant < 256 in any way,
+         * while Intel drivers I've encountered this problem with supports vec4 arrays of size >  GL_MAX_VERTEX/FRAGMENT_UNIFORM_COMPONENTS_ARB / 4
+         * so use it here.
+         * @todo: add logging
+         * @todo: perhaps should be movet to quirks?
+         * */
+        if (gl_info->limits.glsl_vs_float_constants < 256 && gl_max >= 256)
+        {
+            DWORD dwVersion = GetVersion();
+            DWORD dwMajor = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+            DWORD dwMinor = (DWORD)(HIBYTE(LOWORD(dwVersion)));
+            /* tmp workaround Win8 Aero requirement for 256 */
+            if (dwMajor > 6 || dwMinor > 1)
+            {
+                gl_info->limits.glsl_vs_float_constants = 256;
+            }
+        }
+#endif
         TRACE_(d3d_caps)("Max ARB_VERTEX_SHADER float constants: %u.\n", gl_info->limits.glsl_vs_float_constants);
     }
@@ -2504 +2525 @@
         glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max);
         gl_info->limits.glsl_ps_float_constants = gl_max / 4;
+#ifdef VBOX_WITH_WDDM
+        /* AFAICT the " / 4" here comes from that we're going to use the glsl_vs/ps_float_constants to create vec4 arrays,
+         * thus each array element has 4 components, so the actual number of vec4 arrays is GL_MAX_VERTEX/FRAGMENT_UNIFORM_COMPONENTS_ARB / 4
+         * win8 Aero won't properly work with this constant < 256 in any way,
+         * while Intel drivers I've encountered this problem with supports vec4 arrays of size >  GL_MAX_VERTEX/FRAGMENT_UNIFORM_COMPONENTS_ARB / 4
+         * so use it here.
+         * @todo: add logging
+         * @todo: perhaps should be movet to quirks?
+         * */
+        if (gl_info->limits.glsl_ps_float_constants < 256 && gl_max >= 256)
+        {
+            DWORD dwVersion = GetVersion();
+            DWORD dwMajor = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+            DWORD dwMinor = (DWORD)(HIBYTE(LOWORD(dwVersion)));
+            /* tmp workaround Win8 Aero requirement for 256 */
+            if (dwMajor > 6 || dwMinor > 1)
+            {
+                gl_info->limits.glsl_ps_float_constants = 256;
+            }
+        }
+#endif
         TRACE_(d3d_caps)("Max ARB_FRAGMENT_SHADER float constants: %u.\n", gl_info->limits.glsl_ps_float_constants);
         glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max);

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c

@@ -192 +192 @@
 /* Extract a line from the info log.
  * Note that this modifies the source string. */
-static char *get_info_log_line(char **ptr)
+static char *get_info_log_line(char **ptr, int *pcbStr)
 {
     char *p, *q;
-
+    const int cbStr = *pcbStr;
+
+    if (!cbStr)
+    {
+        /* zero-length string */
+        return NULL;
+    }
+
+    if ((*ptr)[cbStr-1] != '\0')
+    {
+        ERR("string should be null-rerminated, forcing it!");
+        (*ptr)[cbStr-1] = '\0';
+    }
     p = *ptr;
+    if (!*p)
+    {
+        *pcbStr = 0;
+        return NULL;
+    }
+
     if (!(q = strstr(p, "\n")))
     {
-        if (!*p) return NULL;
+        /* the string contains a single line! */
         *ptr += strlen(p);
+        *pcbStr = 0;
         return p;
     }
+
     *q = '\0';
+    *pcbStr = cbStr - ((uintptr_t)q) - ((uintptr_t)p) - 1;
+    Assert((*pcbStr) >= 0);
+    Assert((*pcbStr) < cbStr);
     *ptr = q + 1;
 
@@ -244 +267 @@
     {
         char *ptr, *line;
+        int cbPtr;
 
         /* Fglrx doesn't terminate the string properly, but it tells us the proper length.
@@ -260 +284 @@
 
         ptr = infoLog;
+        cbPtr = infologLength;
         if (is_spam)
         {
             WDLOG(("Spam received from GLSL shader #%u:\n", obj));
-            while ((line = get_info_log_line(&ptr))) WDLOG(("    %s\n", line));
+            while ((line = get_info_log_line(&ptr, &cbPtr))) WDLOG(("    %s\n", line));
         }
         else
         {
             WDLOG(("Error received from GLSL shader #%u:\n", obj));
-            while ((line = get_info_log_line(&ptr))) WDLOG(("    %s\n", line));
+            while ((line = get_info_log_line(&ptr, &cbPtr))) WDLOG(("    %s\n", line));
         }
         HeapFree(GetProcessHeap(), 0, infoLog);
@@ -279 +304 @@
     GLint tmp, source_size;
     char *source = NULL;
+    int cbPtr;
 
     GL_EXTCALL(glGetObjectParameterivARB(shader, GL_OBJECT_SHADER_SOURCE_LENGTH_ARB, &tmp));
@@ -299 +325 @@
 
     ptr = source;
+    cbPtr = source_size;
     GL_EXTCALL(glGetShaderSourceARB(shader, source_size, NULL, source));
 #if 0
-    while ((line = get_info_log_line(&ptr))) WDLOG(("    %s\n", line));
+    while ((line = get_info_log_line(&ptr, &cbPtr))) WDLOG(("    %s\n", line));
 #else
     WDLOG(("*****shader source***\n"));
@@ -1033 +1060 @@
                  * Writing gl_ClipVertex requires one uniform for each clipplane as well.
                  */
-#ifdef DEBUG_misha
-                /* tmp work-around to make Internet Explorer in win8 work with GPU supporting only with 256 shader uniform vars */
-                max_constantsF = gl_info->limits.glsl_vs_float_constants - 1;
+#ifdef VBOX_WITH_WDDM
+                if (gl_info->limits.glsl_vs_float_constants == 256)
+                {
+                    DWORD dwVersion = GetVersion();
+                    DWORD dwMajor = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+                    DWORD dwMinor = (DWORD)(HIBYTE(LOWORD(dwVersion)));
+                    /* tmp workaround Win8 Aero requirement for 256 */
+                    if (dwMajor > 6 || dwMinor > 1)
+                    {
+                        /* tmp work-around to make Internet Explorer in win8 work with GPU supporting only with 256 shader uniform vars
+                         * @todo: make it more robust */
+                        max_constantsF = gl_info->limits.glsl_vs_float_constants - 1;
+                    }
+                    else
+                        max_constantsF = gl_info->limits.glsl_vs_float_constants - 3;
+                }
 #else
                 max_constantsF = gl_info->limits.glsl_vs_float_constants - 3;