Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_GetVector() 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 3754ba683f2d3ccb16354a75b530c317382929d8 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 a64947697d
commit 17776bdd0f
2 changed files with 36 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1233,47 +1233,6 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_get_vector(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, D3DXVECTOR4 *vector)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (vector && param && !param->element_count)
{
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
if (param->type == D3DXPT_INT && param->bytes == 4)
{
TRACE("INT fixup\n");
vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE;
vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
return D3D_OK;
}
get_vector(param, vector);
return D3D_OK;
case D3DXPC_MATRIX_ROWS:
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_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count)
{
@ -2970,10 +2929,44 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector);
return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector);
if (vector && param && !param->element_count)
{
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
if (param->type == D3DXPT_INT && param->bytes == 4)
{
TRACE("INT fixup.\n");
vector->x = (((*(int *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE;
vector->y = (((*(int *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE;
vector->z = ((*(int *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE;
vector->w = (((*(int *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE;
return D3D_OK;
}
get_vector(param, vector);
return D3D_OK;
case D3DXPC_MATRIX_ROWS:
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_SetVectorArray(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/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: bd731f6dd12d1e61daf3d6abefb3e01be35f5104}
tags: {wine: 3754ba683f2d3ccb16354a75b530c317382929d8}