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

d3dx9: Merge the d3dx_effect_GetAnnotation() helper. 

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-04 23:15:58 +01:00 committed by Alexandre Julliard
parent e06d90fa3f
commit 7a1df2b006
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/d3dx9_36/effect.c
View File

@ -1286,25 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base,
}
}
static D3DXHANDLE d3dx9_base_effect_get_annotation(struct d3dx9_base_effect *base,
D3DXHANDLE object, UINT index)
{
struct d3dx_parameter *annotations = NULL;
UINT annotation_count = 0;
annotation_count = get_annotation_from_object(base, object, &annotations);
if (index < annotation_count)
{
TRACE("Returning parameter %p\n", &annotations[index]);
return get_parameter_handle(&annotations[index]);
}
WARN("Annotation not found.\n");
return NULL;
}
static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base,
D3DXHANDLE object, const char *name)
{
@ -3513,10 +3494,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const
static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *annotations = NULL;
unsigned int annotation_count;
TRACE("iface %p, object %p, index %u.\n", iface, object, index);
return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index);
annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations);
if (index < annotation_count)
{
TRACE("Returning parameter %p\n", &annotations[index]);
return get_parameter_handle(&annotations[index]);
}
WARN("Annotation not found.\n");
return NULL;
}
static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object,