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

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Tue Mar  5 22:34:25 2019 +0100

d3dx9: Merge the d3dx_effect_GetBool() 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 | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 8147dc1..4ff695c 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1361,22 +1361,6 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA
     return D3DERR_INVALIDCALL;
 }
 
-static HRESULT d3dx9_base_effect_get_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL *b)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (b && param && !param->element_count && param->rows == 1 && param->columns == 1)
-    {
-        set_number(b, D3DXPT_BOOL, param->data, param->type);
-        TRACE("Returning %s\n", *b ? "TRUE" : "FALSE");
-        return D3D_OK;
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, const BOOL *b, UINT count)
 {
@@ -3510,10 +3494,20 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet
 static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
 
     TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b);
 
-    return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b);
+    if (b && param && !param->element_count && param->rows == 1 && param->columns == 1)
+    {
+        set_number(b, D3DXPT_BOOL, param->data, param->type);
+        TRACE("Returning %s\n", *b ? "TRUE" : "FALSE");
+        return D3D_OK;
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }
 
 static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count)