Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetVector() helper.
Alexandre Julliard
julliard at winehq.org
Fri Mar 15 15:20:00 CDT 2019
Module: wine
Branch: master
Commit: 3754ba683f2d3ccb16354a75b530c317382929d8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3754ba683f2d3ccb16354a75b530c317382929d8
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Fri Mar 15 01:56:22 2019 +0100
d3dx9: Merge the d3dx_effect_GetVector() helper.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/effect.c | 77 +++++++++++++++++++++++---------------------------
1 file changed, 35 insertions(+), 42 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 9736165..ea3c97b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1229,47 +1229,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)
{
@@ -2966,10 +2925,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,
More information about the wine-cvs
mailing list