[PATCH 4/5] d3dx9_36: Implemented ID3DXConstantTable_SetMatrix and ID3DXConstantTable_SetMatrixArray

[Travis Athougies]

---
 dlls/d3dx9_36/shader.c |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 90292de..dee2b93 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -986,11 +986,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable*
 static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
                                                        D3DXHANDLE constant, CONST D3DXMATRIX* matrix)
 {
-    ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
-
-    FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, matrix);
-
-    return E_NOTIMPL;
+    return ID3DXConstantTable_SetMatrixArray(iface, device, constant, matrix, 1);
 }
 
 static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
@@ -998,9 +994,37 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable*
 {
     ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
 
-    FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count);
+    D3DXCONSTANT_DESC desc;
+    HRESULT hr;
+    UINT i, desc_count = 1;
 
-    return E_NOTIMPL;
+    hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count);
+    if (FAILED(hr))
+    {
+        TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr);
+        return D3DERR_INVALIDCALL;
+    }
+
+    switch (desc.RegisterSet)
+    {
+    case D3DXRS_FLOAT4:
+	for (i = 0; i < count; i++)
+	{
+            /* D3DXMATRIX is a union, one of whose elements is an array, so it can be cast to a float pointer */
+	    if (is_vertex_shader(This->desc.Version))
+		IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i, (float *)(matrix + i),
+                        desc.RegisterCount);
+	    else
+		IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i, (float *)(matrix + i),
+                        desc.RegisterCount);
+	}
+        break;
+    default:
+        FIXME("Handle other register sets\n");
+        return E_NOTIMPL;
+    }
+
+    return D3D_OK;
 }
 
 static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
-- 
1.7.0.4