[ros-diffs] [reactos] 15/218: [WINESYNC] d3dx9: Get rid of the ID3DXEffectImpl #define.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed2023fc76d14db8af197…

commit ed2023fc76d14db8af1978cb35a0a85a917129e8
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 22:40:25 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:01 2021 +0100

    [WINESYNC] d3dx9: Get rid of the ID3DXEffectImpl #define.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/effect.c | 22 ++++++++++------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index aa7d05fd269..7cfb7e6eaad 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -152,11 +152,9 @@ struct d3dx_technique
     struct IDirect3DStateBlock9 *saved_state;
 };
 
-#define ID3DXEffectImpl d3dx_effect
-
 struct d3dx9_base_effect
 {
-    struct ID3DXEffectImpl *effect;
+    struct d3dx_effect *effect;
 
     UINT parameter_count;
     UINT technique_count;
@@ -722,7 +720,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base)
     }
 }
 
-static void free_effect(struct ID3DXEffectImpl *effect)
+static void free_effect(struct d3dx_effect *effect)
 {
     TRACE("Free effect %p\n", effect);
 
@@ -2845,7 +2843,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op,
D3DMATERIAL9 *ma
     }
 }
 
-static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum
SHADER_CONSTANT_TYPE op, UINT index,
+static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum
SHADER_CONSTANT_TYPE op, UINT index,
         struct d3dx_parameter *param, void *value_ptr)
 {
     static const struct
@@ -2944,10 +2942,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl
*effect, enum
     return ret;
 }
 
-static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass,
+static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass,
         struct d3dx_state *state, unsigned int parent_index, BOOL update_all);
 
-static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct d3dx_pass
*pass,
+static HRESULT d3dx_set_shader_constants(struct d3dx_effect *effect, struct d3dx_pass
*pass,
         struct d3dx_parameter *param, BOOL vs, BOOL update_all)
 {
     HRESULT hr, ret;
@@ -2993,7 +2991,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl
*effect, struct
     return ret;
 }
 
-static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass,
+static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass,
         struct d3dx_state *state, unsigned int parent_index, BOOL update_all)
 {
     struct d3dx_parameter *param;
@@ -3129,7 +3127,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect,
struct d3dx_pas
     return D3D_OK;
 }
 
-static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass
*pass, BOOL update_all)
+static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_pass
*pass, BOOL update_all)
 {
     unsigned int i;
     HRESULT ret;
@@ -6544,7 +6542,7 @@ static const char **parse_skip_constants_string(char
*skip_constants_string, uns
 
 static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base,
         const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude
*include,
-        UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct
d3dx_effect_pool *pool,
+        UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct
d3dx_effect_pool *pool,
         const char *skip_constants_string)
 {
     DWORD tag, offset;
@@ -6687,7 +6685,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect
*base,
     return D3D_OK;
 }
 
-static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9
*device,
+static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9
*device,
         const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude
*include,
         UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char
*skip_constants)
 {
@@ -6731,7 +6729,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device,
const void *s
         const D3DXMACRO *defines, struct ID3DXInclude *include, const char
*skip_constants, DWORD flags,
         struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer
**compilation_errors)
 {
-    struct ID3DXEffectImpl *object;
+    struct d3dx_effect *object;
     HRESULT hr;
 
     TRACE("device %p, srcdata %p, srcdatalen %u, defines %p, include %p,"
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 23af5ad9978..19ffeb1483f 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: 4b85165cdc297f97a3609cfab2d64d87e435397e}
+tags: {wine: d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481}