Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPassByName() helper.
Alexandre Julliard
julliard at winehq.org
Tue Mar 5 15:06:31 CST 2019
Module: wine
Branch: master
Commit: 730e44ebe224c1b70e9f6eaf6a9aaeb8bc38a20b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=730e44ebe224c1b70e9f6eaf6a9aaeb8bc38a20b
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Mon Mar 4 23:16:02 2019 +0100
d3dx9: Merge the d3dx_effect_GetPassByName() 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 | 47 ++++++++++++++++++++---------------------------
1 file changed, 20 insertions(+), 27 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index c9aeb87..eaaae04 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1204,32 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe
return NULL;
}
-static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base,
- D3DXHANDLE technique, const char *name)
-{
- struct d3dx_technique *tech = get_valid_technique(base, technique);
-
- if (tech && name)
- {
- unsigned int i;
-
- for (i = 0; i < tech->pass_count; ++i)
- {
- struct d3dx_pass *pass = &tech->passes[i];
-
- if (!strcmp(pass->name, name))
- {
- TRACE("Returning pass %p\n", pass);
- return get_pass_handle(pass);
- }
- }
- }
-
- WARN("Pass not found.\n");
-
- return NULL;
-}
-
static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object,
struct d3dx_parameter **annotations)
{
@@ -3438,10 +3412,29 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE tech
static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+ struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique);
TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name));
- return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name);
+ if (tech && name)
+ {
+ unsigned int i;
+
+ for (i = 0; i < tech->pass_count; ++i)
+ {
+ struct d3dx_pass *pass = &tech->passes[i];
+
+ if (!strcmp(pass->name, name))
+ {
+ TRACE("Returning pass %p\n", pass);
+ return get_pass_handle(pass);
+ }
+ }
+ }
+
+ WARN("Pass not found.\n");
+
+ return NULL;
}
static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index)
More information about the wine-cvs
mailing list