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

d3dx9: Merge the d3dx_effect_GetBoolArray() 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-05 22:34:26 +01:00 committed by Alexandre Julliard
parent cca43ca090
commit ab7756619c
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/d3dx9_36/effect.c
View File

@ -1400,30 +1400,6 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_get_bool_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, BOOL *b, UINT count)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (b && param && (param->class == D3DXPC_SCALAR
|| param->class == D3DXPC_VECTOR
|| param->class == D3DXPC_MATRIX_ROWS
|| param->class == D3DXPC_MATRIX_COLUMNS))
{
UINT i, size = min(count, param->bytes / sizeof(DWORD));
for (i = 0; i < size; ++i)
{
set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type);
}
return D3D_OK;
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
@ -3522,10 +3498,27 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count)
{
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 %p, count %u.\n", iface, parameter, b, count);
return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count);
if (b && param && (param->class == D3DXPC_SCALAR
|| param->class == D3DXPC_VECTOR
|| param->class == D3DXPC_MATRIX_ROWS
|| param->class == D3DXPC_MATRIX_COLUMNS))
{
unsigned int i, size = min(count, param->bytes / sizeof(DWORD));
for (i = 0; i < size; ++i)
{
set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type);
}
return D3D_OK;
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n)