Michael Stefaniuc : d3dx9: Move flags out of struct d3dx9_base_effect.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7f16670edc3ed5c8ab5bdd88e88a00f8ba1853dc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7f16670edc3ed5c8ab5bdd88e...

Author: Michael Stefaniuc 
Date:   Fri Mar 22 19:09:55 2019 +0100

d3dx9: Move flags out of struct d3dx9_base_effect.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/effect.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index b98cab2..0e91f28 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -152,7 +152,6 @@ struct d3dx9_base_effect
 {
     struct d3dx_effect *effect;

-    DWORD flags;

ULONG64 version_counter;
 };
@@ -169,6 +168,7 @@ struct d3dx_effect
     struct d3dx_top_level_parameter *parameters;
     struct d3dx_technique *techniques;
     struct d3dx_object *objects;
+    DWORD flags;
     struct wine_rb_tree param_tree;
     char *full_name_tmp;
     unsigned int full_name_tmp_size;
@@ -503,8 +503,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3
             sizeof(parameter_magic_string)))
         return handle_param;

-    return effect->base_effect.flags & D3DXFX_LARGEADDRESSAWARE
-                ? NULL : get_parameter_by_name(effect, NULL, parameter);
+    return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(effect, NULL, parameter);
 }

static void free_state(struct d3dx_state *state)
@@ -1914,7 +1913,7 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas
     desc->pVertexShaderFunction = NULL;
     desc->pPixelShaderFunction = NULL;

-    if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE)
+    if (effect->flags & D3DXFX_NOT_CLONEABLE)
         return D3D_OK;

for (i = 0; i < pass->state_count; ++i)
@@ -4097,7 +4096,7 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic
     if (!new_effect)
         return D3DERR_INVALIDCALL;

-    if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE)
+    if (effect->flags & D3DXFX_NOT_CLONEABLE)
         return E_FAIL;

if (!device)
@@ -6181,7 +6180,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
     effect->device = device;

base->effect = effect;
-    base->flags = eflags;
+    effect->flags = eflags;

read_dword(&ptr, &tag);
     TRACE("Tag: %x\n", tag);