Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_GetPass() 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 e419ac91ba5bd295b596f334951657b54dba3e99 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 3d7d27f805
commit 862292231b
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1208,22 +1208,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe
return NULL;
}
static D3DXHANDLE d3dx9_base_effect_get_pass(struct d3dx9_base_effect *base,
D3DXHANDLE technique, UINT index)
{
struct d3dx_technique *tech = get_valid_technique(base, technique);
if (tech && index < tech->pass_count)
{
TRACE("Returning pass %p\n", &tech->passes[index]);
return get_pass_handle(&tech->passes[index]);
}
WARN("Pass not found.\n");
return NULL;
}
static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base,
D3DXHANDLE technique, const char *name)
{
@ -3440,10 +3424,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons
static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique);
TRACE("iface %p, technique %p, index %u.\n", iface, technique, index);
return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index);
if (tech && index < tech->pass_count)
{
TRACE("Returning pass %p\n", &tech->passes[index]);
return get_pass_handle(&tech->passes[index]);
}
WARN("Pass not found.\n");
return NULL;
}
static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name)

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: 89941842affb0fec7068a8bd7adca77d8c036032}
tags: {wine: e419ac91ba5bd295b596f334951657b54dba3e99}