[PATCH 6/8] d3dx9: Merge the d3dx_effect_GetTechniqueDesc() helper

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
The "struct d3dx_technique *tech = technique ? ..." line will fall under
120 chars after the cleanup is finished. So no reason to split it up now.

dlls/d3dx9_36/effect.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index eaaae0456e..473bb930df 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1014,24 +1014,6 @@ static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *ba
     return D3D_OK;
 }

-static HRESULT d3dx9_base_effect_get_technique_desc(struct d3dx9_base_effect *base,
-        D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc)
-{
-    struct d3dx_technique *tech = technique ? get_valid_technique(base, technique) : &base->techniques[0];
-
-    if (!desc || !tech)
-    {
-        WARN("Invalid argument specified.\n");
-        return D3DERR_INVALIDCALL;
-    }
-
-    desc->Name = tech->name;
-    desc->Passes = tech->pass_count;
-    desc->Annotations = tech->annotation_count;
-
-    return D3D_OK;
-}
-
 static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state,
         void **param_value, struct d3dx_parameter **out_param,
         BOOL update_all, BOOL *param_dirty)
@@ -3208,10 +3190,21 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL
         D3DXTECHNIQUE_DESC *desc)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_technique *tech = technique ? get_valid_technique(&effect->base_effect, technique) : &effect->base_effect.techniques[0];

TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc);

-    return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc);
+    if (!desc || !tech)
+    {
+        WARN("Invalid argument specified.\n");
+        return D3DERR_INVALIDCALL;
+    }
+
+    desc->Name = tech->name;
+    desc->Passes = tech->pass_count;
+    desc->Annotations = tech->annotation_count;
+
+    return D3D_OK;
 }

static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc)