Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Pass a struct d3dx_effect to the version helpers.

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 f9351bae3e22ac500c237ab5a0b0556561e913d6 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:29 +02:00 committed by Jérôme Gardou
parent ce95dc5813
commit 7c212953a7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1147,14 +1147,14 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep
return FALSE;
}
static ULONG64 *get_version_counter_ptr(struct d3dx9_base_effect *base)
static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect)
{
return base->pool ? &base->pool->version_counter : &base->version_counter;
return effect->base_effect.pool ? &effect->base_effect.pool->version_counter : &effect->base_effect.version_counter;
}
static ULONG64 next_effect_update_version(struct d3dx9_base_effect *base)
static ULONG64 next_effect_update_version(struct d3dx_effect *effect)
{
return next_update_version(get_version_counter_ptr(base));
return next_update_version(get_version_counter_ptr(effect));
}
static void set_dirty(struct d3dx_parameter *param)
@ -1581,7 +1581,7 @@ static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_p
unsigned int i;
HRESULT ret;
HRESULT hr;
ULONG64 new_update_version = next_effect_update_version(&effect->base_effect);
ULONG64 new_update_version = next_effect_update_version(effect);
TRACE("effect %p, pass %p, state_count %u.\n", effect, pass, pass->state_count);
@ -5749,7 +5749,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx
FIXME("Unaligned string_size %u.\n", string_size);
if (FAILED(ret = d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1,
object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval,
get_version_counter_ptr(base), NULL, 0)))
get_version_counter_ptr(effect), NULL, 0)))
return ret;
ret = D3D_OK;
param = state->referenced_param;
@ -5769,7 +5769,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx
TRACE("Creating preshader for object %u.\n", param->members[i].object_id);
object = &effect->objects[param->members[i].object_id];
if (FAILED(ret = d3dx_create_param_eval(base, object->data, object->size, param->type,
&param->members[i].param_eval, get_version_counter_ptr(base),
&param->members[i].param_eval, get_version_counter_ptr(effect),
skip_constants, skip_constants_count)))
break;
}
@ -5888,7 +5888,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data,
if (FAILED(hr = d3dx9_create_object(base, object)))
return hr;
if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type,
&param->param_eval, get_version_counter_ptr(base),
&param->param_eval, get_version_counter_ptr(effect),
skip_constants, skip_constants_count)))
return hr;
}
@ -5902,7 +5902,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data,
if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr)))
return hr;
if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type,
&param->param_eval, get_version_counter_ptr(base), NULL, 0)))
&param->param_eval, get_version_counter_ptr(effect), NULL, 0)))
return hr;
break;
@ -5931,7 +5931,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data,
if (!refpar->param_eval)
{
if (FAILED(hr = d3dx_create_param_eval(base, refobj->data, refobj->size,
refpar->type, &refpar->param_eval, get_version_counter_ptr(base),
refpar->type, &refpar->param_eval, get_version_counter_ptr(effect),
skip_constants, skip_constants_count)))
return hr;
}

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: 956b30dbf3899e3cd0ccccc17d99f01047caf634}
tags: {wine: f9351bae3e22ac500c237ab5a0b0556561e913d6}