[WINESYNC] d3dx9: Merge the d3dx_effect_GetFloatArray() 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 cf4c22bd712594f3589070c493fc550770ebc899 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:27 +02:00 committed by Jérôme Gardou
parent 6450fd6db3
commit 0e01a12034
2 changed files with 17 additions and 26 deletions

View file

@ -1550,30 +1550,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)
{
@ -3573,10 +3549,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)

View file

@ -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: 460fd21ccc6785172167553e6dd124fdec020d11}
tags: {wine: cf4c22bd712594f3589070c493fc550770ebc899}