Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() 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 c47355a3dc3685c44982ecb9944c0826c0b03526 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 09e5a68482
commit efeffca80e
2 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1530,41 +1530,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (param && count <= param->element_count)
{
UINT i;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
set_dirty(param);
for (i = 0; i < count; ++i)
{
set_matrix(&param->members[i], matrix[i]);
}
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_OBJECT:
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_matrix_transpose(struct d3dx9_base_effect *base, static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX *matrix) D3DXHANDLE parameter, const D3DXMATRIX *matrix)
{ {
@ -3529,10 +3494,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX
const D3DXMATRIX **matrix, UINT count) const D3DXMATRIX **matrix, UINT count)
{ {
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); if (param && count <= param->element_count)
{
unsigned int i;
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
set_dirty(param);
for (i = 0; i < count; ++i)
set_matrix(&param->members[i], matrix[i]);
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_OBJECT:
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_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter,

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/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/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} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 96e2d0e018ba469599d50527f187c53f93b76216} tags: {wine: c47355a3dc3685c44982ecb9944c0826c0b03526}