Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_SetFloatArray() helper.

Browse source 
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 86dff681fc6c36a77b84ec7ded4dfc3f889e2882 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 b6b435e16c
commit b1ee53bf49
2 changed files with 31 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
dll/directx/wine/d3dx9_36/effect.c
View file

@ -1492,44 +1492,6 @@ static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const float *f, 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)
{
set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
}
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_vector(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXVECTOR4 *vector)
{
@ -3534,10 +3496,39 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
const 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_set_float_array(&effect->base_effect, parameter, f, 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)
set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT);
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_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count)

2
sdk/tools/winesync/d3dx9.cfg
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: 2543e78b828f842813066827b5b2fb4565a51f7e}
tags: {wine: 86dff681fc6c36a77b84ec7ded4dfc3f889e2882}