Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Simplify get_parameter_by_name().

Browse source 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 4a9fe7a8a092095420532ae734ebce9978b1e608 by Matteo Bruni <mbruni@codeweavers.com>
This commit is contained in:
winesync 2020-09-21 22:40:24 +02:00 committed by Jérôme Gardou
parent 25cd02e501
commit 0a939c57a8
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/directx/wine/d3dx9_36/effect.c
View file

@ -922,7 +922,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);
@ -952,9 +951,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++)
@ -973,9 +974,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);

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: eb0eaf7027797c6a99b4b5ecdb70c5ba336dccc2} tags: {wine: 4a9fe7a8a092095420532ae734ebce9978b1e608}