Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Pass a struct d3dx_effect to get_annotation_from_object().

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 89941842affb0fec7068a8bd7adca77d8c036032 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 de908e3bd1
commit 3d7d27f805
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dll/directx/wine/d3dx9_36/effect.c
View file

@ -1250,9 +1250,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b
return NULL; return NULL;
} }
static UINT get_annotation_from_object(struct d3dx9_base_effect *base, static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object,
D3DXHANDLE object, struct d3dx_parameter **annotations) struct d3dx_parameter **annotations)
{ {
struct d3dx9_base_effect *base = &effect->base_effect;
struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_parameter *param = get_valid_parameter(base, object);
struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_pass *pass = get_valid_pass(base, object);
struct d3dx_technique *technique = get_valid_technique(base, object); struct d3dx_technique *technique = get_valid_technique(base, object);
@ -3476,7 +3477,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL
TRACE("iface %p, object %p, index %u.\n", iface, object, index); 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) if (index < annotation_count)
{ {
@ -3505,7 +3506,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D
return NULL; 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); annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name);
if (annotation) if (annotation)

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/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/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} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 1dd9104724b333fe27c2a1b7e57b31c29a252420} tags: {wine: 89941842affb0fec7068a8bd7adca77d8c036032}