[PATCH 06/10] d3dx9: Merge the d3dx_effect_SetFloatArray() helper
Michael Stefaniuc
mstefani at winehq.org
Thu Mar 7 17:13:55 CST 2019
Signed-off-by: Michael Stefaniuc <mstefani 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 47bb6b7985..230af5bde8 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1488,44 +1488,6 @@ static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, const float *f, UINT count)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (param)
- {
- UINT i, size = min(count, param->bytes / sizeof(DWORD));
-
- TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
-
- switch (param->class)
- {
- case D3DXPC_SCALAR:
- case D3DXPC_VECTOR:
- case D3DXPC_MATRIX_ROWS:
- for (i = 0; i < size; ++i)
- {
- set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
- }
- set_dirty(param);
- 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_vector(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXVECTOR4 *vector)
{
@@ -3530,10 +3492,39 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
const float *f, 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, f %p, count %u.\n", iface, parameter, f, count);
- return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count);
+ if (param)
+ {
+ unsigned int i, size = min(count, param->bytes / sizeof(DWORD));
+
+ TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
+
+ switch (param->class)
+ {
+ case D3DXPC_SCALAR:
+ case D3DXPC_VECTOR:
+ case D3DXPC_MATRIX_ROWS:
+ for (i = 0; i < size; ++i)
+ set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
+ set_dirty(param);
+ 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_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count)
--
2.20.1
More information about the wine-devel
mailing list