[v3 5/7] d3dx9: implement sampler and texture effect states application.

[Matteo Bruni]

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp at gmail.com>:
> Signed-off-by: Paul Gofman <gofmanp at gmail.com>
> ---
>  dlls/d3dx9_36/effect.c       | 41 +++++++++++++++++++++++++++++++++++++++--
>  dlls/d3dx9_36/tests/effect.c |  2 +-
>  2 files changed, 40 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
> index e1f01f2..6813c79 100644
> --- a/dlls/d3dx9_36/effect.c
> +++ b/dlls/d3dx9_36/effect.c
> @@ -2681,7 +2681,8 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA
>      return D3D_OK;
>  }
>
> -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state)
> +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass,
> +        struct d3dx_state *state, int parent_index)

I would have used an unsigned int here, flagging "none" with ~0u.