Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixArray().
Alexandre Julliard
julliard at winehq.org
Thu Jul 21 10:50:49 CDT 2011
Module: wine
Branch: master
Commit: 75836b4789a3a55267d5f6501a03124305ec5ee9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=75836b4789a3a55267d5f6501a03124305ec5ee9
Author: Rico Schüller <kgbricola at web.de>
Date: Thu Jul 21 08:47:43 2011 +0200
d3dx9: Implement ID3DXBaseEffect::GetMatrixArray().
---
dlls/d3dx9_36/effect.c | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 624bd98..331f4e6 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1934,10 +1934,42 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface,
static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count)
{
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+ struct d3dx_parameter *param = get_valid_parameter(This, parameter);
- FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count);
+ TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix);
- return E_NOTIMPL;
+ if (!count) return D3D_OK;
+
+ if (matrix && param && count <= param->element_count)
+ {
+ UINT i;
+
+ TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
+
+ switch (param->class)
+ {
+ case D3DXPC_MATRIX_ROWS:
+ for (i = 0; i < count; ++i)
+ {
+ get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]);
+ }
+ 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_SetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count)
More information about the wine-cvs
mailing list