Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetBool() helper.
Alexandre Julliard
julliard at winehq.org
Fri Mar 8 19:41:10 CST 2019
Module: wine
Branch: master
Commit: b4bc9ea7b711c03b93d15bb2ba04dfbbb9d70f72
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4bc9ea7b711c03b93d15bb2ba04dfbbb9d70f72
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Fri Mar 8 00:13:50 2019 +0100
d3dx9: Merge the d3dx_effect_SetBool() 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 | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 4deb40f..abf0bd9 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1345,22 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL b)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (param && !param->element_count && param->rows == 1 && param->columns == 1)
- {
- set_number(param->data, param->type, &b, D3DXPT_BOOL);
- set_dirty(param);
- return D3D_OK;
- }
-
- WARN("Parameter not found.\n");
-
- return D3DERR_INVALIDCALL;
-}
-
static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const BOOL *b, UINT count)
{
@@ -3461,10 +3445,20 @@ static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parame
static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+ struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b);
- return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b);
+ if (param && !param->element_count && param->rows == 1 && param->columns == 1)
+ {
+ set_number(param->data, param->type, &b, D3DXPT_BOOL);
+ set_dirty(param);
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b)
More information about the wine-cvs
mailing list