Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 02:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Move flags out of struct d3dx9_base_effect.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7f16670edc3ed5c8ab5bdd88e88a00f8ba1853dc by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:50:18 +02:00 committed by Jérôme Gardou
parent 9fd48117e6
commit b2df33e579
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dll/directx/wine/d3dx9_36/effect.c
View file

@ -156,7 +156,6 @@ struct d3dx9_base_effect
{
struct d3dx_effect *effect;
DWORD flags;
ULONG64 version_counter;
};
@ -173,6 +172,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;
@ -507,8 +507,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)
@ -1918,7 +1917,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)
@ -4101,7 +4100,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)
@ -6185,7 +6184,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);

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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: c56906599cdad729834a6807747ce2c928fc511d}
tags: {wine: 7f16670edc3ed5c8ab5bdd88e88a00f8ba1853dc}