Elizabeth Figura : wined3d: Remove the no longer used ignore_textype argument of wined3d_ffp_get_fs_settings().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ac23ca135291958218d63266d9268ed671ffc676
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ac23ca135291958218d63266d9268ed...

Author: Elizabeth Figura 
Date:   Thu Apr 25 16:00:01 2024 -0500

wined3d: Remove the no longer used ignore_textype argument of wined3d_ffp_get_fs_settings().

---

dlls/wined3d/glsl_shader.c     | 2 +-
 dlls/wined3d/utils.c           | 9 +++------
 dlls/wined3d/wined3d_private.h | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ba61fe5a3cd..ea79e0361e0 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -10408,7 +10408,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
         struct glsl_ffp_fragment_shader *ffp_shader;
         struct ffp_frag_settings settings;

-        wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings, FALSE);
+        wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings);
         ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl);
         ps_id = ffp_shader->id;
         ps_list = &ffp_shader->linked_programs;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index e4ff36425ab..a1c5a00d51f 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -6257,8 +6257,8 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr
     *dst = tmp;
 }

-void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state,
-        struct ffp_frag_settings *settings, BOOL ignore_textype)
+void wined3d_ffp_get_fs_settings(const struct wined3d_context *context,
+        const struct wined3d_state *state, struct ffp_frag_settings *settings)
 {
 #define ARG1 0x01
 #define ARG2 0x02
@@ -6324,10 +6324,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st
                 settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY;
             else
                 settings->op[i].color_fixup = texture->resource.format->color_fixup;
-            if (ignore_textype)
-                settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D;
-            else
-                settings->op[i].tex_type = texture->resource.gl_type;
+            settings->op[i].tex_type = texture->resource.gl_type;
         } else {
             settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY;
             settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3040e40d5e9..67ddf6f88cd 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2678,8 +2678,8 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb

extern const struct wined3d_parent_ops wined3d_null_parent_ops;

-void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state,
-        struct ffp_frag_settings *settings, BOOL ignore_textype);
+void wined3d_ffp_get_fs_settings(const struct wined3d_context *context,
+        const struct wined3d_state *state, struct ffp_frag_settings *settings);
 const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders,
         const struct ffp_frag_settings *settings);
 void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc);