[reactos] 47/218: [WINESYNC] d3dx9: Merge the d3dx_effect_SetInt() helper.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c31253e62acfd15aa62b…

commit 6c31253e62acfd15aa62b4cd7bc3ae461e2ffc9a
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 22:40:27 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:02 2021 +0100

    [WINESYNC] d3dx9: Merge the d3dx_effect_SetInt() helper.
    
    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>
    
    wine commit id 2e771d77761a78b1b597144edfd69ae05b31561e by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 78 +++++++++++++++++---------------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 61a7a3620c9..4f5bde7008d 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1349,49 +1349,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect
*base,
     return D3DERR_INVALIDCALL;
 }
 
-static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE
parameter, INT n)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (param && !param->element_count)
-    {
-        if (param->rows == 1 && param->columns == 1)
-        {
-            DWORD value;
-
-            set_number(&value, param->type, &n, D3DXPT_INT);
-            if (value != *(DWORD *)param->data)
-                set_dirty(param);
-             *(DWORD *)param->data = value;
-            return D3D_OK;
-        }
-
-        /*
-         * Split the value, if parameter is a vector with dimension 3 or 4.
-         */
-        if (param->type == D3DXPT_FLOAT &&
-            ((param->class == D3DXPC_VECTOR && param->columns != 2) ||
-            (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2
&& param->columns == 1)))
-        {
-            TRACE("Vector fixup\n");
-
-            *(FLOAT *)param->data = ((n & 0xff0000) >> 16) *
INT_FLOAT_MULTI_INVERSE;
-            ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) *
INT_FLOAT_MULTI_INVERSE;
-            ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
-            if (param->rows * param->columns > 3)
-            {
-                ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) *
INT_FLOAT_MULTI_INVERSE;
-            }
-            set_dirty(param);
-            return D3D_OK;
-        }
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, const INT *n, UINT count)
 {
@@ -3355,10 +3312,43 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface,
D3DXHANDLE pa
 static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT
n)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect,
parameter);
 
     TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n);
 
-    return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n);
+    if (param && !param->element_count)
+    {
+        if (param->rows == 1 && param->columns == 1)
+        {
+            DWORD value;
+
+            set_number(&value, param->type, &n, D3DXPT_INT);
+            if (value != *(DWORD *)param->data)
+                set_dirty(param);
+            *(DWORD *)param->data = value;
+            return D3D_OK;
+        }
+
+        /* Split the value if parameter is a vector with dimension 3 or 4. */
+        if (param->type == D3DXPT_FLOAT
+                && ((param->class == D3DXPC_VECTOR &&
param->columns != 2)
+                || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2
&& param->columns == 1)))
+        {
+            TRACE("Vector fixup.\n");
+
+            *(float *)param->data = ((n & 0xff0000) >> 16) *
INT_FLOAT_MULTI_INVERSE;
+            ((float *)param->data)[1] = ((n & 0xff00) >> 8) *
INT_FLOAT_MULTI_INVERSE;
+            ((float *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE;
+            if (param->rows * param->columns > 3)
+                ((float *)param->data)[3] = ((n & 0xff000000) >> 24) *
INT_FLOAT_MULTI_INVERSE;
+            set_dirty(param);
+            return D3D_OK;
+        }
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }
 
 static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT
*n)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 73097766d95..1928a01d280 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 570ae3b2aa2e7da3f14fbd59979a39e8f21763be}
+tags: {wine: 2e771d77761a78b1b597144edfd69ae05b31561e}