Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPass() helper.
Alexandre Julliard
julliard at winehq.org
Tue Mar 5 15:06:30 CST 2019
Module: wine
Branch: master
Commit: e419ac91ba5bd295b596f334951657b54dba3e99
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e419ac91ba5bd295b596f334951657b54dba3e99
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Mon Mar 4 23:16:01 2019 +0100
d3dx9: Merge the d3dx_effect_GetPass() 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 | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index c621b21..c9aeb87 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1204,22 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe
return NULL;
}
-static D3DXHANDLE d3dx9_base_effect_get_pass(struct d3dx9_base_effect *base,
- D3DXHANDLE technique, UINT index)
-{
- struct d3dx_technique *tech = get_valid_technique(base, technique);
-
- if (tech && index < tech->pass_count)
- {
- TRACE("Returning pass %p\n", &tech->passes[index]);
- return get_pass_handle(&tech->passes[index]);
- }
-
- WARN("Pass not found.\n");
-
- return NULL;
-}
-
static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base,
D3DXHANDLE technique, const char *name)
{
@@ -3436,10 +3420,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons
static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+ struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique);
TRACE("iface %p, technique %p, index %u.\n", iface, technique, index);
- return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index);
+ if (tech && index < tech->pass_count)
+ {
+ TRACE("Returning pass %p\n", &tech->passes[index]);
+ return get_pass_handle(&tech->passes[index]);
+ }
+
+ WARN("Pass not found.\n");
+
+ return NULL;
}
static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name)
More information about the wine-cvs
mailing list