Paul Gofman : d3dx9: Store effect creation flags in struct d3dx_base_effect.
Alexandre Julliard
julliard at winehq.org
Wed May 3 16:06:10 CDT 2017
Module: wine
Branch: master
Commit: a52a2d1aab877925018903334a2315d082546750
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52a2d1aab877925018903334a2315d082546750
Author: Paul Gofman <gofmanp at gmail.com>
Date: Fri Apr 28 21:24:12 2017 +0300
d3dx9: Store effect creation flags in struct d3dx_base_effect.
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/effect.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 6a5afff..787967d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -154,6 +154,7 @@ struct d3dx9_base_effect
struct d3dx_object *objects;
struct d3dx_effect_pool *pool;
+ DWORD flags;
};
struct ID3DXEffectImpl
@@ -169,7 +170,7 @@ struct ID3DXEffectImpl
struct d3dx_technique *active_technique;
struct d3dx_pass *active_pass;
BOOL started;
- DWORD flags;
+ DWORD begin_flags;
D3DLIGHT9 current_light[8];
BOOL light_updated[8];
@@ -4019,7 +4020,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW
*passes = technique->pass_count;
effect->started = TRUE;
- effect->flags = flags;
+ effect->begin_flags = flags;
return D3D_OK;
}
@@ -4090,7 +4091,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface)
if (!effect->started)
return D3D_OK;
- if (effect->flags & D3DXFX_DONOTSAVESTATE)
+ if (effect->begin_flags & D3DXFX_DONOTSAVESTATE)
{
TRACE("State restoring disabled.\n");
}
@@ -6238,6 +6239,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base,
base->effect = effect;
base->pool = pool;
+ base->flags = eflags;
read_dword(&ptr, &tag);
TRACE("Tag: %x\n", tag);
More information about the wine-cvs
mailing list