Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetTechniqueByName() helper.
Alexandre Julliard
julliard at winehq.org
Tue Mar 5 15:06:31 CST 2019
Module: wine
Branch: master
Commit: a2e0046fc52c4e08a64cbe76c78f184e7d5b27d2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e0046fc52c4e08a64cbe76c78f184e7d5b27d2
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Mon Mar 4 23:16:04 2019 +0100
d3dx9: Merge the d3dx_effect_GetTechniqueByName() 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 | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 473bb93..126916d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1170,22 +1170,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base
return get_technique_handle(&base->techniques[index]);
}
-static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effect *base, const char *name)
-{
- struct d3dx_technique *tech = get_technique_by_name(base, name);
-
- if (tech)
- {
- D3DXHANDLE t = get_technique_handle(tech);
- TRACE("Returning technique %p\n", t);
- return t;
- }
-
- WARN("Technique not found.\n");
-
- return NULL;
-}
-
static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object,
struct d3dx_parameter **annotations)
{
@@ -3378,10 +3362,20 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index
static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+ struct d3dx_technique *tech = get_technique_by_name(&effect->base_effect, name);
TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
- return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name);
+ if (tech)
+ {
+ D3DXHANDLE t = get_technique_handle(tech);
+ TRACE("Returning technique %p\n", t);
+ return t;
+ }
+
+ WARN("Technique not found.\n");
+
+ return NULL;
}
static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index)
More information about the wine-cvs
mailing list