Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to d3dx9_create_object().
Alexandre Julliard
julliard at winehq.org
Thu Mar 21 17:21:19 CDT 2019
Module: wine
Branch: master
Commit: 92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Mar 20 17:46:27 2019 +0100
d3dx9: Pass a struct d3dx_effect to d3dx9_create_object().
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/effect.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index b8fb904..d2af2d5 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -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,
¶m->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;
}
}
More information about the wine-cvs
mailing list