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

d3dx9: Merge the d3dx_effect_SetBool() 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-08 00:13:50 +01:00 committed by Alexandre Julliard
parent 2b02c2be5c
commit b4bc9ea7b7
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/d3dx9_36/effect.c
View File

@ -1345,22 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL b)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (param && !param->element_count && param->rows == 1 && param->columns == 1)
{
set_number(param->data, param->type, &b, D3DXPT_BOOL);
set_dirty(param);
return D3D_OK;
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const BOOL *b, UINT count) D3DXHANDLE parameter, const BOOL *b, UINT count)
{ {
@ -3461,10 +3445,20 @@ static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parame
static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b)
{ {
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);
TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b);
return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b); if (param && !param->element_count && param->rows == 1 && param->columns == 1)
{
set_number(param->data, param->type, &b, D3DXPT_BOOL);
set_dirty(param);
return D3D_OK;
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
} }
static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b)