[Mesa-dev] [Mesa-stable] [PATCH] draw: (trivial) fix NULL pointer dereference

[Brian Paul]

On 06/04/2015 06:37 AM, sroland at vmware.com wrote:
> From: Roland Scheidegger <sroland at vmware.com>
>
> This probably got broken when the samplers were converted to be indexed
> by shader type.
> Seen when looking at bug 89819 though I'm not sure if that really was what
> the bug was about...
>
> Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
> ---
>   src/gallium/auxiliary/draw/draw_llvm.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
> index 885c27c..9629a8a 100644
> --- a/src/gallium/auxiliary/draw/draw_llvm.c
> +++ b/src/gallium/auxiliary/draw/draw_llvm.c
> @@ -1969,7 +1969,7 @@ draw_llvm_set_sampler_state(struct draw_context *draw,
>         for (i = 0; i < draw->num_samplers[PIPE_SHADER_VERTEX]; i++) {
>            struct draw_jit_sampler *jit_sam = &draw->llvm->jit_context.samplers[i];
>
> -         if (draw->samplers[i]) {
> +         if (draw->samplers[PIPE_SHADER_VERTEX][i]) {
>               const struct pipe_sampler_state *s
>                  = draw->samplers[PIPE_SHADER_VERTEX][i];
>               jit_sam->min_lod = s->min_lod;
> @@ -1982,7 +1982,7 @@ draw_llvm_set_sampler_state(struct draw_context *draw,
>         for (i = 0; i < draw->num_samplers[PIPE_SHADER_GEOMETRY]; i++) {
>            struct draw_jit_sampler *jit_sam = &draw->llvm->gs_jit_context.samplers[i];
>
> -         if (draw->samplers[i]) {
> +         if (draw->samplers[PIPE_SHADER_GEOMETRY][i]) {
>               const struct pipe_sampler_state *s
>                  = draw->samplers[PIPE_SHADER_GEOMETRY][i];
>               jit_sam->min_lod = s->min_lod;
>

Reviewed-by: Brian Paul <brianp at vmware.com>