ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Pass a struct d3dx_effect to d3dx9_create_object(). 

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

8
dlls/d3dx9_36/effect.c
View File

@ -5674,10 +5674,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)
@ -5880,7 +5880,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),
@ -6057,7 +6057,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;
}
}