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

d3dx9: Implement ID3DXBaseEffect::SetMatrix().

This commit is contained in:
Rico Schüller 2011-11-29 10:04:23 +01:00 committed by Alexandre Julliard
parent 0ca1efc578
commit cebdbb34ac
1 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/d3dx9_36/effect.c
View File

@ -935,6 +935,20 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix)
} }
} }
static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix)
{
unsigned int i, k;
for (i = 0; i < 4; ++i)
{
for (k = 0; k < 4; ++k)
{
if ((i < param->rows) && (k < param->columns))
set_number((float *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT);
}
}
}
static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name)
{ {
UINT element; UINT element;
@ -2077,10 +2091,35 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetVectorArray(ID3DXBaseEffect *iface,
static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix) static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix)
{ {
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(This, parameter);
FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix);
return E_NOTIMPL; if (param && !param->element_count)
{
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
set_matrix(param, matrix);
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("Invalid argument specified\n");
return D3DERR_INVALIDCALL;
} }
static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)