marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init(). 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Michael Stefaniuc 2019-03-20 17:46:26 +01:00 committed by Alexandre Julliard
parent f4d5b357d3
commit de59a12971
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/d3dx9_36/effect.c
View File

@ -6173,11 +6173,11 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns
return new_alloc;
}
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 d3dx_effect *effect, struct d3dx_effect_pool *pool,
const char *skip_constants_string)
static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *data, SIZE_T data_size,
const D3D_SHADER_MACRO *defines, ID3DInclude *include, unsigned int eflags, ID3DBlob **errors,
struct d3dx_effect_pool *pool, const char *skip_constants_string)
{
struct d3dx9_base_effect *base = &effect->base_effect;
DWORD tag, offset;
const char *ptr = data;
HRESULT hr;
@ -6192,9 +6192,9 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base,
#endif
unsigned int i, j;
TRACE("base %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, "
"effect %p, pool %p, skip_constants %s.\n",
base, data, data_size, defines, include, eflags, errors, effect, pool,
TRACE("effect %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, "
"pool %p, skip_constants %s.\n",
effect, data, data_size, defines, include, eflags, errors, pool,
debugstr_a(skip_constants_string));
base->effect = effect;
@ -6339,8 +6339,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
IDirect3DDevice9_AddRef(device);
effect->device = device;
if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include,
eflags, error_messages, effect, pool_impl, skip_constants)))
if (FAILED(hr = d3dx9_base_effect_init(effect, data, data_size, defines, include, eflags,
error_messages, pool_impl, skip_constants)))
{
FIXME("Failed to parse effect, hr %#x.\n", hr);
free_effect(effect);