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

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>
This commit is contained in:
Michael Stefaniuc 2019-03-15 22:39:16 +01:00 committed by Alexandre Julliard
parent 62a26e1ad0
commit 7738fec56b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/d3dx9_36/effect.c
View File

@ -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);