[reactos] 98/218: [WINESYNC] d3dx9: Get rid of struct d3dx9_base_effect.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13aa089045b698366305be...

commit 13aa089045b698366305bee8f832812fa603fd0c
Author:     winesync [e-mail]
AuthorDate: Mon Sep 21 22:50:18 2020 +0200
Commit:     Jérôme Gardou [e-mail]
CommitDate: Thu Feb 4 16:37:03 2021 +0100

[WINESYNC] d3dx9: Get rid of struct d3dx9_base_effect.

Signed-off-by: Michael Stefaniuc [e-mail]
    Signed-off-by: Matteo Bruni [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id 3b951b77f87ed9102fc7a2ccb0807b5592990147 by Michael Stefaniuc [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 15 +++------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index bfd9d5a4048..cd022dbf0ec 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -152,20 +152,11 @@ struct d3dx_technique
     struct IDirect3DStateBlock9 *saved_state;
 };

-struct d3dx9_base_effect
-{
-    struct d3dx_effect *effect;
-
-
-    ULONG64 version_counter;
-};
-
 struct d3dx_effect
 {
     ID3DXEffect ID3DXEffect_iface;
     LONG ref;

-    struct d3dx9_base_effect base_effect;
     unsigned int parameter_count;
     unsigned int technique_count;
     unsigned int object_count;
@@ -173,6 +164,7 @@ struct d3dx_effect
     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;
@@ -184,6 +176,7 @@ struct d3dx_effect
     struct d3dx_pass *active_pass;
     BOOL started;
     DWORD begin_flags;
+    ULONG64 version_counter;

D3DLIGHT9 current_light[8];
     unsigned int light_updated;
@@ -1130,7 +1123,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep

static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect)
 {
-    return effect->pool ? &effect->pool->version_counter : &effect->base_effect.version_counter;
+    return effect->pool ? &effect->pool->version_counter : &effect->version_counter;
 }

static ULONG64 next_effect_update_version(struct d3dx_effect *effect)
@@ -6156,7 +6149,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
 #else
     UINT compile_flags = 0;
 #endif
-    struct d3dx9_base_effect *base = &effect->base_effect;
     ID3DBlob *bytecode = NULL, *temp_errors = NULL;
     unsigned int skip_constants_count = 0;
     char *skip_constants_buffer = NULL;
@@ -6183,7 +6175,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
     IDirect3DDevice9_AddRef(device);
     effect->device = device;

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

read_dword(&ptr, &tag);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index e5844e9ca1f..2a08def01b1 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 7f16670edc3ed5c8ab5bdd88e88a00f8ba1853dc}
+tags: {wine: 3b951b77f87ed9102fc7a2ccb0807b5592990147}