Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixTranspose().
Alexandre Julliard
julliard at winehq.org
Thu Jul 21 10:50:49 CDT 2011
Module: wine
Branch: master
Commit: 6a2be190cd145ebdaa7f1d791b6eabf7ba7b9be7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2be190cd145ebdaa7f1d791b6eabf7ba7b9be7
Author: Rico Schüller <kgbricola at web.de>
Date: Thu Jul 21 08:47:30 2011 +0200
d3dx9: Implement ID3DXBaseEffect::GetMatrixTranspose().
---
dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index eeb7894..0ee28c8 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1970,10 +1970,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *if
static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)
{
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+ struct d3dx_parameter *param = get_valid_parameter(This, parameter);
+ D3DXMATRIX m;
- 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 (matrix && param && !param->element_count)
+ {
+ TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
+
+ switch (param->class)
+ {
+ case D3DXPC_SCALAR:
+ case D3DXPC_VECTOR:
+ get_matrix(param, matrix);
+ return D3D_OK;
+
+ case D3DXPC_MATRIX_ROWS:
+ get_matrix(param, &m);
+ D3DXMatrixTranspose(matrix, &m);
+ return D3D_OK;
+
+ 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_SetMatrixTransposeArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count)
More information about the wine-cvs
mailing list