Module: wine Branch: master Commit: 7738fec56b8d55f006babf4d9fb7a1b79cf363af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7738fec56b8d55f006babf4d9...
Author: Michael Stefaniuc mstefani@winehq.org Date: Fri Mar 15 22:39:16 2019 +0100
d3dx9: Pass a struct d3dx_effect to get_annotation_by_name().
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/effect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a45f289..ae577d0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -854,9 +854,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef return NULL; }
-static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, - unsigned int count, struct d3dx_parameter *annotations, const char *name) +static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned int count, + struct d3dx_parameter *annotations, const char *name) { + struct d3dx9_base_effect *base = &effect->base_effect; UINT i, length; struct d3dx_parameter *temp_parameter; const char *part; @@ -2251,7 +2252,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D
annotation_count = get_annotation_from_object(effect, object, &annotations);
- annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + annotation = get_annotation_by_name(effect, annotation_count, annotations, name); if (annotation) { TRACE("Returning parameter %p\n", annotation);