=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9: Implement ID3DXBaseEffect:: SetMatrixTransposeArray().

Alexandre Julliard julliard at winehq.org
Thu Dec 1 14:05:33 CST 2011


Module: wine
Branch: master
Commit: 1e0f04e5cf65c7ccc6ec1e435eb1f26e631ce273
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1e0f04e5cf65c7ccc6ec1e435eb1f26e631ce273

Author: Rico Schüller <kgbricola at web.de>
Date:   Thu Dec  1 13:44:55 2011 +0100

d3dx9: Implement ID3DXBaseEffect::SetMatrixTransposeArray().

---

 dlls/d3dx9_36/effect.c |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 4d08180..2cf12ac 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2305,10 +2305,41 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if
 static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count)
 {
     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, count %u stub\n", This, parameter, matrix, count);
+    TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count);
 
-    return E_NOTIMPL;
+    if (param && param->element_count >= 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)
+                {
+                    set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, &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_GetMatrixTransposeArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count)




More information about the wine-cvs mailing list