wined3d: Use non-deprecated texture sample builtins also in the fragment…

wined3d: Use non-deprecated texture sample builtins also in the fragment pipeline replacement shaders. Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Use non-deprecated texture sample builtins also in the fragment…
245e06d9 · Matteo Bruni · Alexandre Julliard · cc1b2879 · 245e06d9
Commit 245e06d9 authored Oct 21, 2015 by Matteo Bruni Committed by Alexandre Julliard Oct 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

glsl_shader.c dlls/wined3d/glsl_shader.c +5 -0

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -6477,6 +6477,9 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
            proj = TRUE;
        }

+        if (settings->op[stage].tex_type == WINED3D_GL_RES_TYPE_TEX_CUBE)
+            proj = FALSE;
+
        switch (settings->op[stage].tex_type)
        {
            case WINED3D_GL_RES_TYPE_TEX_1D:
@@ -6537,6 +6540,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *
                coord_mask = "xyzw";
                break;
        }
+        if (!needs_legacy_glsl_syntax(gl_info))
+            texture_function = proj ? "textureProj" : "texture";

        if (stage > 0
                && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP