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

d3dx9: Merge the d3dx_effect_SetIntArray() 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-09 11:21:27 +01:00 committed by Alexandre Julliard
parent 2e771d7776
commit 8ea0f9d4dd
1 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dlls/d3dx9_36/effect.c
View File

@ -1345,44 +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_int_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const INT *n, UINT count)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (param)
{
UINT i, size = min(count, param->bytes / sizeof(DWORD));
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
for (i = 0; i < size; ++i)
{
set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
}
set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
case D3DXPC_STRUCT:
break;
default:
FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class));
break;
}
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXVECTOR4 *vector) D3DXHANDLE parameter, const D3DXVECTOR4 *vector)
{ {
@ -3388,10 +3350,39 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete
static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count)
{ {
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, n %p, count %u.\n", iface, parameter, n, count); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); if (param)
{
unsigned int i, size = min(count, param->bytes / sizeof(DWORD));
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
for (i = 0; i < size; ++i)
set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
case D3DXPC_STRUCT:
break;
default:
FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class));
break;
}
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
} }
static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count)