diff options
| author | Roland Scheidegger <[email protected]> | 2015-06-04 14:35:59 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2015-06-05 02:20:35 +0200 |
| commit | 6e5970ffee0129fb94d8b7f0ebd4fac3992e7dce (patch) | |
| tree | d52b745503fcdce87dc9caa9d241d98cc8e9ddc9 /src/gallium/auxiliary/draw | |
| parent | c820407ef0aac87546d1a778e169cfa1a915a219 (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" <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/draw')
| -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 885c27c13c2..9629a8a3e42 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; |