https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab91d0f28e2a7c066ca2b80deba49d8ab8d25079
commit ab91d0f28e2a7c066ca2b80deba49d8ab8d25079 Author: winesync <[email protected]> AuthorDate: Mon Sep 21 22:40:27 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Thu Feb 4 16:37:02 2021 +0100 [WINESYNC] d3dx9: Merge the d3dx_effect_SetBoolArray() helper. Signed-off-by: Michael Stefaniuc <[email protected]> Signed-off-by: Matteo Bruni <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id e435a1442d6499f358168d8a0ca974b43ccd9140 by Michael Stefaniuc <[email protected]> --- dll/directx/wine/d3dx9_36/effect.c | 73 +++++++++++++++++--------------------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 34 insertions(+), 41 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index a131e3d3269..3c75ba8f4ed 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -1349,45 +1349,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const BOOL *b, 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) - { - /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ - set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); - } - 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_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); @@ -3487,10 +3448,42 @@ static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const 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_set_bool_array(&effect->base_effect, parameter, b, 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) + { + /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); + } + 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_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 32e79554d16..0ee4910590b 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} -tags: {wine: b4bc9ea7b711c03b93d15bb2ba04dfbbb9d70f72} +tags: {wine: e435a1442d6499f358168d8a0ca974b43ccd9140}
