Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameterElement() helper.
Alexandre Julliard
julliard at winehq.org
Mon Mar 4 15:08:27 CST 2019
Module: wine
Branch: master
Commit: 3899e79fc429b0c668166ccc98efbd60f5c63aa4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3899e79fc429b0c668166ccc98efbd60f5c63aa4
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sun Mar 3 20:19:48 2019 +0100
d3dx9: Merge the d3dx_effect_GetParameterElement() 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 491fbf9..f010d26 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_element(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, UINT index)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (!param)
- {
- if (index < base->parameter_count)
- {
- TRACE("Returning parameter %p.\n", &base->parameters[index]);
- return get_parameter_handle(&base->parameters[index].param);
- }
- }
- else
- {
- if (index < param->element_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_technique(struct d3dx9_base_effect *base, UINT index)
{
if (index >= base->technique_count)
@@ -3463,10 +3436,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface,
static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(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_element(&effect->base_effect, parameter, index);
+ if (!param)
+ {
+ 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 (index < param->element_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_GetTechnique(ID3DXEffect *iface, UINT index)
More information about the wine-cvs
mailing list