Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetMatrixArray() helper.
Alexandre Julliard
julliard at winehq.org
Mon Mar 11 16:29:52 CDT 2019
Module: wine
Branch: master
Commit: 96e2d0e018ba469599d50527f187c53f93b76216
URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e2d0e018ba469599d50527f187c53f93b76216
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sat Mar 9 11:21:32 2019 +0100
d3dx9: Merge the d3dx_effect_SetMatrixArray() 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 | 69 ++++++++++++++++++++++----------------------------
1 file changed, 30 insertions(+), 39 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 343260b..c5cedbb 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (param && param->element_count >= count)
- {
- UINT i;
-
- TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
-
- switch (param->class)
- {
- case D3DXPC_MATRIX_ROWS:
- set_dirty(param);
- for (i = 0; i < count; ++i)
- {
- set_matrix(¶m->members[i], &matrix[i]);
- }
- return D3D_OK;
-
- case D3DXPC_SCALAR:
- case D3DXPC_VECTOR:
- 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_pointer_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count)
{
@@ -3483,10 +3445,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE
const D3DXMATRIX *matrix, UINT count)
{
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, count %u.\n", iface, parameter, matrix, count);
- return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count);
+ if (param && param->element_count >= count)
+ {
+ unsigned int i;
+
+ TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
+
+ switch (param->class)
+ {
+ case D3DXPC_MATRIX_ROWS:
+ set_dirty(param);
+ for (i = 0; i < count; ++i)
+ set_matrix(¶m->members[i], &matrix[i]);
+ return D3D_OK;
+
+ case D3DXPC_SCALAR:
+ case D3DXPC_VECTOR:
+ 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_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter,
More information about the wine-cvs
mailing list