Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameterElement().
Alexandre Julliard
julliard at winehq.org
Thu Apr 21 11:17:47 CDT 2011
Module: wine
Branch: master
Commit: f296fe68fffab418c6ccf2e0e2851f03ab2974b8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f296fe68fffab418c6ccf2e0e2851f03ab2974b8
Author: Rico Schüller <kgbricola at web.de>
Date: Wed Apr 20 21:55:43 2011 +0200
d3dx9: Implement ID3DXBaseEffect::GetParameterElement().
---
dlls/d3dx9_36/effect.c | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 07ebd1f..67d0698 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -801,8 +801,30 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterBySemantic(ID3DXBaseEff
static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterElement(ID3DXBaseEffect *iface, D3DXHANDLE parameter, UINT index)
{
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+ struct d3dx_parameter *param = is_valid_parameter(This, parameter);
+
+ TRACE("iface %p, parameter %p, index %u\n", This, parameter, index);
+
+ if (!param) param = get_parameter_by_name(This, NULL, parameter, FALSE);
+
+ if (!param)
+ {
+ if (index < This->parameter_count)
+ {
+ TRACE("Returning parameter %p\n", This->parameter_handles[index]);
+ return This->parameter_handles[index];
+ }
+ }
+ else
+ {
+ if (index < param->element_count)
+ {
+ TRACE("Returning parameter %p\n", param->member_handles[index]);
+ return param->member_handles[index];
+ }
+ }
- FIXME("iface %p, parameter %p, index %u stub\n", This, parameter, index);
+ WARN("Invalid argument specified\n");
return NULL;
}
More information about the wine-cvs
mailing list