=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9: Implement ID3DXBaseEffect:: SetValue().
Alexandre Julliard
julliard at winehq.org
Wed Dec 14 13:23:32 CST 2011
Module: wine
Branch: master
Commit: 940b50b2d8e1b1c2d69739fe4d8af8b4cb536cb4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=940b50b2d8e1b1c2d69739fe4d8af8b4cb536cb4
Author: Rico Schüller <kgbricola at web.de>
Date: Tue Dec 13 17:02:42 2011 +0100
d3dx9: Implement ID3DXBaseEffect::SetValue().
---
dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index d9fc0b9..75680d3 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1603,10 +1603,48 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect
static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCVOID data, UINT bytes)
{
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+ struct d3dx_parameter *param = get_valid_parameter(This, parameter);
- FIXME("iface %p, parameter %p, data %p, bytes %u stub\n", This, parameter, data, bytes);
+ TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes);
- return E_NOTIMPL;
+ if (!param)
+ {
+ WARN("Invalid parameter %p specified\n", parameter);
+ return D3DERR_INVALIDCALL;
+ }
+
+ /* samplers don't touch data */
+ if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER
+ || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D
+ || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE))
+ {
+ TRACE("Sampler: returning E_FAIL\n");
+ return E_FAIL;
+ }
+
+ if (data && param->bytes >= bytes)
+ {
+ switch (param->type)
+ {
+ case D3DXPT_VOID:
+ case D3DXPT_BOOL:
+ case D3DXPT_INT:
+ case D3DXPT_FLOAT:
+ TRACE("Copy %u bytes\n", bytes);
+ memcpy(param->data, data, bytes);
+ break;
+
+ default:
+ FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type));
+ break;
+ }
+
+ return D3D_OK;
+ }
+
+ WARN("Invalid argument specified\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPVOID data, UINT bytes)
More information about the wine-cvs
mailing list