https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c490400306e3344edee26...
commit 3c490400306e3344edee263bb5c33b4dcbc067d4 Author: winesync ros-dev@reactos.org AuthorDate: Mon Sep 21 22:40:26 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Thu Feb 4 16:37:02 2021 +0100
[WINESYNC] d3dx9: Merge the d3dx_effect_GetBoolArray() helper.
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id ab7756619c1b16c761618a68d1b6a06ad437cbe8 by Michael Stefaniuc mstefani@winehq.org --- dll/directx/wine/d3dx9_36/effect.c | 43 ++++++++++++++++---------------------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 9ff76097072..f0a1bbfc4bf 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -1404,30 +1404,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); @@ -3526,10 +3502,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) diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 0048c27ab3e..a2da305b7fc 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: cca43ca090ccb27c5e3d3564dbe69a424f0c9872} +tags: {wine: ab7756619c1b16c761618a68d1b6a06ad437cbe8}