Changeset 58152 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Oct 9, 2015 1:38:57 PM (9 years ago)

Author:

vboxsync

Message:

WDDM: wine workaround for Intel GLSL compiler quirk

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• Makefile.kmk (modified) (1 diff)
• wined3d/glsl_shader.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

@@ -177 +177 @@
         VBOX_WITH_WINE_FIX_CURVBO \
         VBOX_WITH_WINE_FIX_FTOA \
+        VBOX_WITH_WINE_FIX_SHADER_DECL \
         VBOX_WITH_WINE_DBG
 #wined3d_DEFS        += VBOX_WITH_WINE_FIXES

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

@@ -1199 +1199 @@
     for (i = 0, map = reg_maps->texcoord; map; map >>= 1, ++i)
     {
+#ifdef VBOX_WITH_WINE_FIX_SHADER_DECL
+        if (map & 1) shader_addline(buffer, "vec4 T%u;\n", i);
+#else
         if (map & 1) shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i);
+#endif
     }
 
@@ -1327 +1331 @@
     /* Start the main program. */
     shader_addline(buffer, "void main()\n{\n");
+
+#ifdef VBOX_WITH_WINE_FIX_SHADER_DECL
+    /* Initialize texture coordinate temporaries. */
+    for (i = 0, map = reg_maps->texcoord; map; map >>= 1, ++i)
+    {
+        if (map & 1) shader_addline(buffer, "T%u = gl_TexCoord[%u];\n", i, i);
+    }
+#endif
 
     /* Direct3D applications expect integer vPos values, while OpenGL drivers