Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetFloatArray().
Alexandre Julliard
julliard at winehq.org
Thu Jun 9 11:47:39 CDT 2011
Module: wine
Branch: master
Commit: ecf37efd8287740d62392afbf4093e22fd47dd53
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf37efd8287740d62392afbf4093e22fd47dd53
Author: Rico Schüller <kgbricola at web.de>
Date: Thu Jun 9 07:38:34 2011 +0200
d3dx9: Implement ID3DXBaseEffect::GetFloatArray().
---
dlls/d3dx9_36/effect.c | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index c18d581..ef5ad0b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1710,10 +1710,29 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloatArray(ID3DXBaseEffect *iface,
static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT *f, UINT count)
{
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+ struct d3dx_parameter *param = is_valid_parameter(This, parameter);
- FIXME("iface %p, parameter %p, f %p, count %u stub\n", This, parameter, f, count);
+ TRACE("iface %p, parameter %p, f %p, count %u\n", This, parameter, f, count);
- return E_NOTIMPL;
+ if (!param) param = get_parameter_by_name(This, NULL, parameter);
+
+ if (f && param && (param->class == D3DXPC_SCALAR
+ || param->class == D3DXPC_VECTOR
+ || param->class == D3DXPC_MATRIX_ROWS
+ || param->class == D3DXPC_MATRIX_COLUMNS))
+ {
+ UINT i, size = min(count, param->bytes / sizeof(DWORD));
+
+ for (i = 0; i < size; ++i)
+ {
+ f[i] = get_float(param->type, (DWORD *)param->data + i);
+ }
+ return D3D_OK;
+ }
+
+ WARN("Invalid argument specified\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DXHANDLE parameter, CONST D3DXVECTOR4* vector)
More information about the wine-cvs
mailing list