d3dx9: Merge the d3dx_effect_GetMatrixTranspose() helper.

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

d3dx9: Merge the d3dx_effect_GetMatrixTranspose() helper.
2fdd724a · Michael Stefaniuc · Alexandre Julliard · 91b53147 · 2fdd724a
Commit 2fdd724a authored Mar 11, 2019 by Michael Stefaniuc Committed by Alexandre Julliard Mar 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 29 additions and 36 deletions

effect.c dlls/d3dx9_36/effect.c +29 -36

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1559,41 +1559,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *
    return D3DERR_INVALIDCALL;
 }

-static HRESULT d3dx9_base_effect_get_matrix_transpose(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, D3DXMATRIX *matrix)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (matrix && param && !param->element_count)
-    {
-        TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
-
-        switch (param->class)
-        {
-            case D3DXPC_SCALAR:
-            case D3DXPC_VECTOR:
-                get_matrix(param, matrix, FALSE);
-                return D3D_OK;
-
-            case D3DXPC_MATRIX_ROWS:
-                get_matrix(param, matrix, TRUE);
-                return D3D_OK;
-
-            case D3DXPC_OBJECT:
-            case D3DXPC_STRUCT:
-                break;
-
-            default:
-                FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class));
-                break;
-        }
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base,
        D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count)
 {
@@ -3576,10 +3541,38 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
        D3DXMATRIX *matrix)
 {
    struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);

    TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix);

-    return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix);
+    if (matrix && param && !param->element_count)
+    {
+        TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
+
+        switch (param->class)
+        {
+            case D3DXPC_SCALAR:
+            case D3DXPC_VECTOR:
+                get_matrix(param, matrix, FALSE);
+                return D3D_OK;
+
+            case D3DXPC_MATRIX_ROWS:
+                get_matrix(param, matrix, TRUE);
+                return D3D_OK;
+
+            case D3DXPC_OBJECT:
+            case D3DXPC_STRUCT:
+                break;
+
+            default:
+                FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class));
+                break;
+        }
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }

 static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter,