wined3d: Check all the ffp_material fields.

The application can override each material parameter with one of the two FFP vertex color attributes. The 'ambient' struct field in the GLSL shader can thus happen to be unused and the GL driver may optimize it away.

wined3d: Check all the ffp_material fields.
2bab1f72 · Matteo Bruni · Alexandre Julliard · 0c05f9f8 · 2bab1f72
Commit 2bab1f72 authored May 04, 2015 by Matteo Bruni Committed by Alexandre Julliard May 05, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

glsl_shader.c dlls/wined3d/glsl_shader.c +4 -1

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -6761,7 +6761,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
                break;
            }
        }
-        if (entry->vs.material_ambient_location != -1)
+        if (entry->vs.material_ambient_location != -1 || entry->vs.material_diffuse_location != -1
+                || entry->vs.material_specular_location != -1
+                || entry->vs.material_emissive_location != -1
+                || entry->vs.material_shininess_location != -1)
            entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL;
        if (entry->vs.light_ambient_location != -1)
            entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_LIGHTS;