[Mesa-dev] [PATCH 1/2] radeonsi: Handle NULL sampler states.

[Alex Deucher]

On Mon, Sep 10, 2012 at 12:25 PM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

For the series:

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  src/gallium/drivers/radeonsi/si_state.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index 67880f2..5240036 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -2310,7 +2310,7 @@ static void si_bind_ps_sampler(struct pipe_context *ctx, unsigned count, void **
>         si_pm4_sh_data_begin(pm4);
>         for (i = 0; i < count; i++) {
>                 for (j = 0; j < Elements(rstates[i]->val); ++j) {
> -                       si_pm4_sh_data_add(pm4, rstates[i]->val[j]);
> +                       si_pm4_sh_data_add(pm4, rstates[i] ? rstates[i]->val[j] : 0);
>                 }
>         }
>         si_pm4_sh_data_end(pm4, R_00B038_SPI_SHADER_USER_DATA_PS_2);
> --
> 1.7.10.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev