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

Alexandre Julliard julliard at winehq.org
Tue Jul 10 19:01:42 CDT 2012


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

Author: Rico Schüller <kgbricola at web.de>
Date:   Mon Jul  9 22:11:27 2012 +0200

d3dx9: Implement ID3DXBaseEffect::GetMatrixPointerArray().

---

 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 877df29..5c90283 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2425,10 +2425,41 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect
 static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(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, count %u\n", This, parameter, matrix, count);
 
-    return E_NOTIMPL;
+    if (!count) return D3D_OK;
+
+    if (param && matrix && 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:
+                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_SetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix)




More information about the wine-cvs mailing list