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

d3dx9: Merge the d3dx_effect_GetMatrix() 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-09 11:21:28 +01:00 committed by Alexandre Julliard
parent 8ea0f9d4dd
commit 636a2b5a39
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
dlls/d3dx9_36/effect.c
View File

@ -1559,38 +1559,6 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_get_matrix(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, D3DXMATRIX *matrix)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (matrix && param && !param->element_count)
{
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
get_matrix(param, matrix, FALSE);
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
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_matrix_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count)
{
@ -3564,10 +3532,35 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param
static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix);
return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix);
if (matrix && param && !param->element_count)
{
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
get_matrix(param, matrix, FALSE);
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
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_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter,