diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2015-06-04 14:35:59 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-12 15:49:29 +0100 |
| commit | 4f68af254e55967d7b14f9cf8ced5f2509f0706b (patch) | |
| tree | e77d9c297b449933c48d00cdeedc46a790ea0b35 | |
| parent | 70ac6a2655334b3e4f662ca228c2f3681305e52d (diff) | |
draw: (trivial) fix NULL pointer dereference
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@lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 6e5970ffee0129fb94d8b7f0ebd4fac3992e7dce)
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index b9e55af42c7..552060d0fa4 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -1965,7 +1965,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; @@ -1978,7 +1978,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; |