Commit 7ab5f903 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

wined3d: Rename gen_ffp_frag_op().

parent e106bbdd
...@@ -6581,7 +6581,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi ...@@ -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 /* Find or create a shader implementing the fixed function pipeline
* settings, then activate it. */ * 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); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings);
if (!desc) if (!desc)
{ {
......
...@@ -1024,7 +1024,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined ...@@ -1024,7 +1024,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined
DWORD mapped_stage; DWORD mapped_stage;
unsigned int i; 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); desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings);
if (!desc) if (!desc)
{ {
......
...@@ -10321,7 +10321,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, ...@@ -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 glsl_ffp_fragment_shader *ffp_shader;
struct ffp_frag_settings settings; 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); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl);
ps_id = ffp_shader->id; ps_id = ffp_shader->id;
ps_list = &ffp_shader->linked_programs; ps_list = &ffp_shader->linked_programs;
......
...@@ -6053,7 +6053,7 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr ...@@ -6053,7 +6053,7 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr
*dst = tmp; *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) struct ffp_frag_settings *settings, BOOL ignore_textype)
{ {
#define ARG1 0x01 #define ARG1 0x01
......
...@@ -3528,7 +3528,7 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb ...@@ -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; 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; 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_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders,
const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment