mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-24 12:03:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_GetAnnotation() helper.

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

wine commit id 7a1df2b0069bde1a9a022c6454fb8b3e06181fd0 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:26 +02:00 committed by Jérôme Gardou
parent f3d009fd46
commit 3a9af49488
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dll/directx/wine/d3dx9_36/effect.c
View File

@ -1290,25 +1290,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)
{
@ -3517,10 +3498,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,

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/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}
tags: {wine: 45e7e2f2d501d92436a00f97edec660a2f7a2927}
tags: {wine: 7a1df2b0069bde1a9a022c6454fb8b3e06181fd0}