ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Pass a struct d3dx_effect to add_param_to_tree(). 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2019-03-15 22:39:15 +01:00 committed by Alexandre Julliard
parent f9351bae3e
commit 62a26e1ad0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/d3dx9_36/effect.c
View File

@ -5072,7 +5072,7 @@ static int param_rb_compare(const void *key, const struct wine_rb_entry *entry)
return strcmp(name, param->full_name);
}
static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parameter *param,
static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter *param,
struct d3dx_parameter *parent, char separator, unsigned int element)
{
const char *parent_name = parent ? parent->full_name : NULL;
@ -5127,18 +5127,18 @@ static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parame
memcpy(param->full_name, param->name, len);
}
TRACE("Full name is %s.\n", param->full_name);
wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry);
wine_rb_put(&effect->base_effect.param_tree, param->full_name, &param->rb_entry);
if (is_top_level_parameter(param))
for (i = 0; i < param->top_level_param->annotation_count; ++i)
add_param_to_tree(base, &param->top_level_param->annotations[i], param, '@', 0);
add_param_to_tree(effect, &param->top_level_param->annotations[i], param, '@', 0);
if (param->element_count)
for (i = 0; i < param->element_count; ++i)
add_param_to_tree(base, &param->members[i], param, '[', i);
add_param_to_tree(effect, &param->members[i], param, '[', i);
else
for (i = 0; i < param->member_count; ++i)
add_param_to_tree(base, &param->members[i], param, '.', 0);
add_param_to_tree(effect, &param->members[i], param, '.', 0);
}
static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx_parameter *param,
@ -6013,7 +6013,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U
}
walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param,
&base->parameters[i]);
add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0);
add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0);
}
}