Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameter() helper.
Alexandre Julliard
julliard at winehq.org
Mon Mar 4 15:08:27 CST 2019
Module: wine
Branch: master
Commit: 2f1ba910d133b93a3da55de4d0b3577936fd8224
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1ba910d133b93a3da55de4d0b3577936fd8224
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sun Mar 3 20:19:46 2019 +0100
d3dx9: Merge the d3dx_effect_GetParameter() helper.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++----------------------------
1 file changed, 21 insertions(+), 28 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 22f098e..41636ed 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base,
return D3D_OK;
}
-static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, UINT index)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (!parameter)
- {
- if (index < base->parameter_count)
- {
- TRACE("Returning parameter %p.\n", &base->parameters[index]);
- return get_parameter_handle(&base->parameters[index].param);
- }
- }
- else
- {
- if (param && !param->element_count && index < param->member_count)
- {
- TRACE("Returning parameter %p.\n", ¶m->members[index]);
- return get_parameter_handle(¶m->members[index]);
- }
- }
-
- WARN("Parameter not found.\n");
-
- return NULL;
-}
-
static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const char *semantic)
{
@@ -3436,10 +3409,30 @@ static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE
static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+ struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index);
- return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index);
+ if (!parameter)
+ {
+ if (index < effect->base_effect.parameter_count)
+ {
+ TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]);
+ return get_parameter_handle(&effect->base_effect.parameters[index].param);
+ }
+ }
+ else
+ {
+ if (param && !param->element_count && index < param->member_count)
+ {
+ TRACE("Returning parameter %p.\n", ¶m->members[index]);
+ return get_parameter_handle(¶m->members[index]);
+ }
+ }
+
+ WARN("Parameter not found.\n");
+
+ return NULL;
}
static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter,
More information about the wine-cvs
mailing list