[PATCH 7/7] d3dx9: Merge the d3dx_effect_GetBoolArray() helper
Michael Stefaniuc
mstefani at winehq.org
Tue Mar 5 15:34:26 CST 2019
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3dx9_36/effect.c | 43 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 4ff695c6dd..4deb40f55e 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1400,30 +1400,6 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_get_bool_array(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, BOOL *b, UINT count)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (b && 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(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type);
- }
- return D3D_OK;
- }
-
- WARN("Parameter not found.\n");
-
- return D3DERR_INVALIDCALL;
-}
-
static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
@@ -3522,10 +3498,27 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, 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, b %p, count %u.\n", iface, parameter, b, count);
- return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count);
+ if (b && 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(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type);
+ }
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n)
--
2.20.1
More information about the wine-devel
mailing list