Commit 4a9fe7a8 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3dx9: Simplify get_parameter_by_name().

parent eb0eaf70
...@@ -918,7 +918,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, ...@@ -918,7 +918,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return NULL; return NULL;
} }
/* Pass / technique annotations are not in the parameters tree. */
if (parameter->full_name) if (parameter->full_name)
{ {
name_len = strlen(name); name_len = strlen(name);
...@@ -948,9 +947,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, ...@@ -948,9 +947,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return NULL; return NULL;
} }
/* Pass / technique annotations are not stored in the parameters tree,
* do a linear search. */
count = parameter->member_count; count = parameter->member_count;
length = strcspn( name, "[.@" ); length = strcspn( name, "[." );
part = name + length; part = name + length;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
...@@ -969,9 +970,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, ...@@ -969,9 +970,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
case '.': case '.':
return get_parameter_by_name(base, temp_parameter, part); return get_parameter_by_name(base, temp_parameter, part);
case '@':
return NULL;
case '[': case '[':
return get_parameter_element_by_name(base, temp_parameter, part); return get_parameter_element_by_name(base, temp_parameter, part);
......
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