Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_valid_pass().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 956b30dbf3899e3cd0ccccc17d99f01047caf634
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=956b30dbf3899e3cd0ccccc17...

Author: Michael Stefaniuc <mstefani(a)winehq.org>
Date:   Fri Mar 15 22:39:13 2019 +0100

d3dx9: Pass a struct d3dx_effect to get_valid_pass().

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3dx9_36/effect.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 3d90cc6..7196546 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -483,8 +483,9 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3
     return get_technique_by_name(effect, technique);
 }
 
-static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass)
+static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE pass)
 {
+    struct d3dx9_base_effect *base = &effect->base_effect;
     unsigned int i, k;
 
     for (i = 0; i < base->technique_count; ++i)
@@ -1087,9 +1088,8 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta
 static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object,
         struct d3dx_parameter **annotations)
 {
-    struct d3dx9_base_effect *base = &effect->base_effect;
     struct d3dx_parameter *param = get_valid_parameter(effect, object);
-    struct d3dx_pass *pass = get_valid_pass(base, object);
+    struct d3dx_pass *pass = get_valid_pass(effect, object);
     struct d3dx_technique *technique = get_valid_technique(effect, object);
 
     if (pass)
@@ -1918,7 +1918,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL
 static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass_handle, D3DXPASS_DESC *desc)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
-    struct d3dx_pass *pass = get_valid_pass(&effect->base_effect, pass_handle);
+    struct d3dx_pass *pass = get_valid_pass(effect, pass_handle);
     unsigned int i;
 
     TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc);