Module: wine Branch: master Commit: e2b1f0cce946333ee954a3f8dd372f85a6403023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b1f0cce946333ee954a3f8dd...
Author: Rico Schüller kgbricola@web.de Date: Tue Dec 13 17:02:29 2011 +0100
d3dx9: Implement ID3DXBaseEffect::GetVector().
---
dlls/d3dx9_36/effect.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 927e067..d9cd085 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2032,10 +2032,44 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_GetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter);
- FIXME("iface %p, parameter %p, vector %p stub\n", This, parameter, vector); + TRACE("iface %p, parameter %p, vector %p\n", This, parameter, vector);
- return E_NOTIMPL; + if (vector && param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + TRACE("INT fixup\n"); + vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; + vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + return D3D_OK; + } + get_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + 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_SetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXVECTOR4 *vector, UINT count)