Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Pass a struct d3dx_effect to d3dx9_create_object().

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 92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0 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 9ed5adb0c1
commit 515c280579
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5678,10 +5678,10 @@ err_out:
return hr;
}
static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_object *object)
static HRESULT d3dx9_create_object(struct d3dx_effect *effect, struct d3dx_object *object)
{
struct d3dx_parameter *param = object->param;
struct IDirect3DDevice9 *device = base->effect->device;
IDirect3DDevice9 *device = effect->device;
HRESULT hr;
if (*(char **)param->data)
@ -5884,7 +5884,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data,
if (object->data)
{
if (FAILED(hr = d3dx9_create_object(base, object)))
if (FAILED(hr = d3dx9_create_object(effect, object)))
return hr;
if (FAILED(hr = d3dx_create_param_eval(effect, object->data, object->size, param->type,
&param->param_eval, get_version_counter_ptr(effect),
@ -6061,7 +6061,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U
if (effect->objects[id].data)
{
if (FAILED(hr = d3dx9_create_object(base, &effect->objects[id])))
if (FAILED(hr = d3dx9_create_object(effect, &effect->objects[id])))
goto err_out;
}
}

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: de59a1297111dfd0be93dccaa2db31865c61b79a}
tags: {wine: 92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0}