[PATCH 2/7] d3dx9: Pass a struct d3dx_effect to get_valid_parameter()
Michael Stefaniuc
mstefani at winehq.org
Fri Mar 15 16:39:12 CDT 2019
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3dx9_36/effect.c | 91 +++++++++++++++++++++---------------------
1 file changed, 46 insertions(+), 45 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index d2e03f50d4..3d90cc6cb3 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -501,7 +501,7 @@ static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHAND
return NULL;
}
-static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter)
+static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3DXHANDLE parameter)
{
struct d3dx_parameter *handle_param = (struct d3dx_parameter *)parameter;
@@ -509,7 +509,8 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base
sizeof(parameter_magic_string)))
return handle_param;
- return base->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(base, NULL, parameter);
+ return effect->base_effect.flags & D3DXFX_LARGEADDRESSAWARE
+ ? NULL : get_parameter_by_name(&effect->base_effect, NULL, parameter);
}
static void free_state(struct d3dx_state *state)
@@ -1087,7 +1088,7 @@ static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXH
struct d3dx_parameter **annotations)
{
struct d3dx9_base_effect *base = &effect->base_effect;
- struct d3dx_parameter *param = get_valid_parameter(base, object);
+ struct d3dx_parameter *param = get_valid_parameter(effect, object);
struct d3dx_pass *pass = get_valid_pass(base, object);
struct d3dx_technique *technique = get_valid_technique(effect, object);
@@ -1867,7 +1868,7 @@ static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDL
D3DXPARAMETER_DESC *desc)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc);
@@ -1976,7 +1977,7 @@ static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE
static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index);
@@ -2006,7 +2007,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DX
const char *name)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
D3DXHANDLE handle;
TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name));
@@ -2028,7 +2029,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface,
const char *semantic)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
struct d3dx_parameter *temp_param;
unsigned int i;
@@ -2089,7 +2090,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface,
static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index);
@@ -2266,7 +2267,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame
const void *data, UINT bytes)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
unsigned int i;
TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes);
@@ -2341,7 +2342,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame
static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes);
@@ -2406,7 +2407,7 @@ static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parame
static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b);
@@ -2425,7 +2426,7 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet
static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b);
@@ -2444,7 +2445,7 @@ static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE paramet
static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count);
@@ -2485,7 +2486,7 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count);
@@ -2511,7 +2512,7 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa
static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n);
@@ -2553,7 +2554,7 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete
static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n);
@@ -2591,7 +2592,7 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete
static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
@@ -2629,7 +2630,7 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par
static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
@@ -2653,7 +2654,7 @@ static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE par
static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f);
@@ -2676,7 +2677,7 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parame
static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f);
@@ -2696,7 +2697,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
const float *f, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count);
@@ -2734,7 +2735,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count);
@@ -2758,7 +2759,7 @@ static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE p
static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector);
@@ -2812,7 +2813,7 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param
static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector);
@@ -2856,7 +2857,7 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE
const D3DXVECTOR4 *vector, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count);
@@ -2906,7 +2907,7 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE
D3DXVECTOR4 *vector, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count);
@@ -2946,7 +2947,7 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE
static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix);
@@ -2981,7 +2982,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param
static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix);
@@ -3016,7 +3017,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE
const D3DXMATRIX *matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3055,7 +3056,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE
D3DXMATRIX *matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3096,7 +3097,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX
const D3DXMATRIX **matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3132,7 +3133,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DX
D3DXMATRIX **matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3172,7 +3173,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
const D3DXMATRIX *matrix)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix);
@@ -3208,7 +3209,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHAN
D3DXMATRIX *matrix)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix);
@@ -3246,7 +3247,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3
const D3DXMATRIX *matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3285,7 +3286,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3
D3DXMATRIX *matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3326,7 +3327,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if
const D3DXMATRIX **matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3362,7 +3363,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if
D3DXMATRIX **matrix, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count);
@@ -3401,7 +3402,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if
static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string));
@@ -3419,7 +3420,7 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param
static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string);
@@ -3439,7 +3440,7 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para
IDirect3DBaseTexture9 *texture)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture);
@@ -3473,7 +3474,7 @@ static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE para
IDirect3DBaseTexture9 **texture)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture);
@@ -3498,7 +3499,7 @@ static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE
IDirect3DPixelShader9 **shader)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader);
@@ -3519,7 +3520,7 @@ static HRESULT WINAPI d3dx_effect_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE
IDirect3DVertexShader9 **shader)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader);
@@ -3797,7 +3798,7 @@ static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_techniqu
static BOOL WINAPI d3dx_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXHANDLE technique)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+ struct d3dx_parameter *param = get_valid_parameter(effect, parameter);
struct d3dx_technique *tech = get_valid_technique(effect, technique);
BOOL ret;
--
2.20.1
More information about the wine-devel
mailing list