Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetFloatArray() helper.
Alexandre Julliard
julliard at winehq.org
Fri Mar 8 19:41:10 CST 2019
Module: wine
Branch: master
Commit: cf4c22bd712594f3589070c493fc550770ebc899
URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4c22bd712594f3589070c493fc550770ebc899
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Fri Mar 8 00:13:53 2019 +0100
d3dx9: Merge the d3dx_effect_GetFloatArray() 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 | 41 ++++++++++++++++-------------------------
1 file changed, 16 insertions(+), 25 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 0052d8f..70351b2 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1546,30 +1546,6 @@ static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_get_float_array(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, float *f, UINT count)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (f && param && (param->class == D3DXPC_SCALAR
- || param->class == D3DXPC_VECTOR
- || param->class == D3DXPC_MATRIX_ROWS
- || param->class == D3DXPC_MATRIX_COLUMNS))
- {
- UINT i, size = min(count, param->bytes / sizeof(DWORD));
-
- for (i = 0; i < size; ++i)
- {
- set_number(&f[i], D3DXPT_FLOAT, (DWORD *)param->data + i, param->type);
- }
- return D3D_OK;
- }
-
- 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)
{
@@ -3569,10 +3545,25 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, 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_get_float_array(&effect->base_effect, parameter, f, count);
+ if (f && param && (param->class == D3DXPC_SCALAR
+ || param->class == D3DXPC_VECTOR
+ || param->class == D3DXPC_MATRIX_ROWS
+ || param->class == D3DXPC_MATRIX_COLUMNS))
+ {
+ unsigned int i, size = min(count, param->bytes / sizeof(DWORD));
+
+ for (i = 0; i < size; ++i)
+ set_number(&f[i], D3DXPT_FLOAT, (DWORD *)param->data + i, param->type);
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector)
More information about the wine-cvs
mailing list