Matteo Bruni : d3dx9: Simplify get_parameter_by_name().
Alexandre Julliard
julliard at winehq.org
Wed Feb 20 16:37:01 CST 2019
Module: wine
Branch: master
Commit: 4a9fe7a8a092095420532ae734ebce9978b1e608
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a9fe7a8a092095420532ae734ebce9978b1e608
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Wed Feb 20 16:58:33 2019 +0100
d3dx9: Simplify get_parameter_by_name().
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/effect.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 1abc8dc..b0dc366 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -918,7 +918,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return NULL;
}
- /* Pass / technique annotations are not in the parameters tree. */
if (parameter->full_name)
{
name_len = strlen(name);
@@ -948,9 +947,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return NULL;
}
+ /* Pass / technique annotations are not stored in the parameters tree,
+ * do a linear search. */
count = parameter->member_count;
- length = strcspn( name, "[.@" );
+ length = strcspn( name, "[." );
part = name + length;
for (i = 0; i < count; i++)
@@ -969,9 +970,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
case '.':
return get_parameter_by_name(base, temp_parameter, part);
- case '@':
- return NULL;
-
case '[':
return get_parameter_element_by_name(base, temp_parameter, part);
More information about the wine-cvs
mailing list