Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetFloat() helper.
Alexandre Julliard
julliard at winehq.org
Fri Mar 8 19:41:10 CST 2019
Module: wine
Branch: master
Commit: 2543e78b828f842813066827b5b2fb4565a51f7e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2543e78b828f842813066827b5b2fb4565a51f7e
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Fri Mar 8 00:13:54 2019 +0100
d3dx9: Merge the d3dx_effect_SetFloat() 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 | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 70351b2..47bb6b7 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1488,26 +1488,6 @@ static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect *base, D3DXHANDLE parameter, float f)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (param && !param->element_count && param->rows == 1 && param->columns == 1)
- {
- DWORD value;
-
- set_number(&value, param->type, &f, D3DXPT_FLOAT);
- if (value != *(DWORD *)param->data)
- set_dirty(param);
- *(DWORD *)param->data = value;
- return D3D_OK;
- }
-
- WARN("Parameter not found.\n");
-
- return D3DERR_INVALIDCALL;
-}
-
static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const float *f, UINT count)
{
@@ -3507,10 +3487,24 @@ static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE par
static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f)
{
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 %.8e.\n", iface, parameter, f);
- return d3dx9_base_effect_set_float(&effect->base_effect, parameter, f);
+ if (param && !param->element_count && param->rows == 1 && param->columns == 1)
+ {
+ DWORD value;
+
+ set_number(&value, param->type, &f, D3DXPT_FLOAT);
+ if (value != *(DWORD *)param->data)
+ set_dirty(param);
+ *(DWORD *)param->data = value;
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f)
More information about the wine-cvs
mailing list