Module: wine Branch: master Commit: 7ab5f90396b0a4b2a0f145acf3b4f2ff9de72ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ab5f90396b0a4b2a0f145acf...
Author: Matteo Bruni mbruni@codeweavers.com Date: Mon May 31 21:12:54 2021 +0200
wined3d: Rename gen_ffp_frag_op().
Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7bec9d70d29..7bd68d615d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6581,7 +6581,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi { /* Find or create a shader implementing the fixed function pipeline * settings, then activate it. */ - gen_ffp_frag_op(context, state, &settings, FALSE); + wined3d_ffp_get_fs_settings(context, state, &settings, FALSE); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); if (!desc) { diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index ae2843db403..08fb2c81507 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1024,7 +1024,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined DWORD mapped_stage; unsigned int i;
- gen_ffp_frag_op(context, state, &settings, TRUE); + wined3d_ffp_get_fs_settings(context, state, &settings, TRUE); desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); if (!desc) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3876e71af58..5a3cb4c8a69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10321,7 +10321,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;
- gen_ffp_frag_op(&context_gl->c, state, &settings, FALSE); + wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings, FALSE); 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 dc7823b9534..b39fb46cadc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6053,7 +6053,7 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; }
-void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { #define ARG1 0x01 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e3efccffc2..21f34a5895d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3528,7 +3528,7 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb
extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN;
-void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN;