Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetIntArray() helper.
Alexandre Julliard
julliard at winehq.org
Mon Mar 11 16:29:52 CDT 2019
Module: wine
Branch: master
Commit: 570ae3b2aa2e7da3f14fbd59979a39e8f21763be
URL: https://source.winehq.org/git/wine.git/?a=commit;h=570ae3b2aa2e7da3f14fbd59979a39e8f21763be
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sat Mar 9 11:21:25 2019 +0100
d3dx9: Merge the d3dx_effect_GetIntArray() 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 5d0be34..7425c7b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1426,30 +1426,6 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, INT *n, UINT count)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (n && 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(&n[i], D3DXPT_INT, (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)
{
@@ -3431,10 +3407,25 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, 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, n %p, count %u.\n", iface, parameter, n, count);
- return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count);
+ if (n && 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(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type);
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f)
More information about the wine-cvs
mailing list