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

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>
This commit is contained in:
Michael Stefaniuc 2019-03-04 23:16:01 +01:00 committed by Alexandre Julliard
parent 89941842af
commit e419ac91ba
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/d3dx9_36/effect.c
View File

@ -1204,22 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe
return NULL; 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, static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base,
D3DXHANDLE technique, const char *name) D3DXHANDLE technique, const char *name)
{ {
@ -3436,10 +3420,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons
static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index)
{ {
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); 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); 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) static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name)