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

d3dx9: Merge the d3dx_effect_GetParameterByName() helper. 

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-03 20:19:45 +01:00 committed by Alexandre Julliard
parent d265afcd8f
commit 78e067b0d0
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/d3dx9_36/effect.c
View File

@ -1204,25 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base
return NULL; return NULL;
} }
static D3DXHANDLE d3dx9_base_effect_get_parameter_by_name(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const char *name)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
D3DXHANDLE handle;
if (!name)
{
handle = get_parameter_handle(param);
TRACE("Returning parameter %p.\n", handle);
return handle;
}
handle = get_parameter_handle(get_parameter_by_name(base, param, name));
TRACE("Returning parameter %p.\n", handle);
return handle;
}
static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const char *semantic) D3DXHANDLE parameter, const char *semantic)
{ {
@ -3465,10 +3446,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DX
const char *name) const char *name)
{ {
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
D3DXHANDLE handle;
TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name));
return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); if (!name)
{
handle = get_parameter_handle(param);
TRACE("Returning parameter %p.\n", handle);
return handle;
}
handle = get_parameter_handle(get_parameter_by_name(&effect->base_effect, param, name));
TRACE("Returning parameter %p.\n", handle);
return handle;
} }
static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter,