Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetTechnique() helper.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Mon Mar  4 23:16:05 2019 +0100

d3dx9: Merge the d3dx_effect_GetTechnique() helper.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/effect.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 126916d..6a0b262 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1157,19 +1157,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base,
     return D3D_OK;
 }

-static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index)
-{
-    if (index >= base->technique_count)
-    {
-        WARN("Invalid argument specified.\n");
-        return NULL;
-    }
-
-    TRACE("Returning technique %p.\n", &base->techniques[index]);
-
-    return get_technique_handle(&base->techniques[index]);
-}
-
 static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object,
         struct d3dx_parameter **annotations)
 {
@@ -3356,7 +3343,15 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index

TRACE("iface %p, index %u.\n", iface, index);

-    return d3dx9_base_effect_get_technique(&effect->base_effect, index);
+    if (index >= effect->base_effect.technique_count)
+    {
+        WARN("Invalid argument specified.\n");
+        return NULL;
+    }
+
+    TRACE("Returning technique %p.\n", &effect->base_effect.techniques[index]);
+
+    return get_technique_handle(&effect->base_effect.techniques[index]);
 }

static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name)