[WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixTranspose() 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 81203bdb0462ecce8f2791f1599cf1fedf318ad7 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:28 +02:00 committed by Jérôme Gardou
parent b74269badf
commit 3f197f6fc7
2 changed files with 28 additions and 35 deletions

View file

@ -1530,39 +1530,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX *matrix)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (param && !param->element_count)
{
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
set_dirty(param);
set_matrix_transpose(param, matrix);
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
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_matrix_transpose_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count)
{
@ -3458,10 +3425,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
const D3DXMATRIX *matrix)
{
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.\n", iface, parameter, matrix);
return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix);
if (param && !param->element_count)
{
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
set_dirty(param);
set_matrix_transpose(param, matrix);
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
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_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter,

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: 95a8cfad14f1d87b9f7512f96c5c06edba04ca70}
tags: {wine: 81203bdb0462ecce8f2791f1599cf1fedf318ad7}