Skip to content

W
wine-cw
Commit 89941842 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

d3dx9: Pass a struct d3dx_effect to get_annotation_from_object().

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@winehq.org> Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1dd91047
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
dlls/d3dx9_36/effect.c
View file @ 89941842
......@@ -1246,9 +1246,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b
return NULL;
}
static UINT get_annotation_from_object(struct d3dx9_base_effect *base,
D3DXHANDLE object, struct d3dx_parameter **annotations)
static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object,
struct d3dx_parameter **annotations)
{
struct d3dx9_base_effect *base = &effect->base_effect;
struct d3dx_parameter *param = get_valid_parameter(base, object);
struct d3dx_pass *pass = get_valid_pass(base, object);
struct d3dx_technique *technique = get_valid_technique(base, object);
......@@ -3472,7 +3473,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL
TRACE("iface %p, object %p, index %u.\n", iface, object, index);
annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations);
annotation_count = get_annotation_from_object(effect, object, &annotations);
if (index < annotation_count)
{
......@@ -3501,7 +3502,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D
return NULL;
}
annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations);
annotation_count = get_annotation_from_object(effect, object, &annotations);
annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name);
if (annotation)
......
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