Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 02:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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 956b30dbf3899e3cd0ccccc17d99f01047caf634 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:29 +02:00 committed by Jérôme Gardou
parent 0c4e3081da
commit ce95dc5813
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -487,8 +487,9 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3
return get_technique_by_name(effect, technique);
}
static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass)
static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE pass)
{
struct d3dx9_base_effect *base = &effect->base_effect;
unsigned int i, k;
for (i = 0; i < base->technique_count; ++i)
@ -1091,9 +1092,8 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta
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(effect, object);
struct d3dx_pass *pass = get_valid_pass(base, object);
struct d3dx_pass *pass = get_valid_pass(effect, object);
struct d3dx_technique *technique = get_valid_technique(effect, object);
if (pass)
@ -1922,7 +1922,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL
static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass_handle, D3DXPASS_DESC *desc)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_pass *pass = get_valid_pass(&effect->base_effect, pass_handle);
struct d3dx_pass *pass = get_valid_pass(effect, pass_handle);
unsigned int i;
TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc);

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: 6ecc2c51b3849d313ad670a4b0ff14ca50aeb26a}
tags: {wine: 956b30dbf3899e3cd0ccccc17d99f01047caf634}