Module: Mesa
Branch: master
Commit: 66992463ac294b1a106090250ad2af305f9d8a10
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=66992463ac294b1a106090250ad2af305f9d8a10

Author: Brian Paul <[email protected]>
Date:   Thu Sep 30 16:41:31 2010 -0600

draw: check for null sampler pointers

http://bugs.freedesktop.org/show_bug.cgi?id=30516

---

 src/gallium/auxiliary/draw/draw_llvm.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_llvm.c 
b/src/gallium/auxiliary/draw/draw_llvm.c
index 4749bb5..7fb86d7 100644
--- a/src/gallium/auxiliary/draw/draw_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_llvm.c
@@ -1099,10 +1099,12 @@ draw_llvm_set_sampler_state(struct draw_context *draw)
    for (i = 0; i < draw->num_samplers; i++) {
       struct draw_jit_texture *jit_tex = &draw->llvm->jit_context.textures[i];
 
-      jit_tex->min_lod = draw->samplers[i]->min_lod;
-      jit_tex->max_lod = draw->samplers[i]->max_lod;
-      jit_tex->lod_bias = draw->samplers[i]->lod_bias;
-      COPY_4V(jit_tex->border_color, draw->samplers[i]->border_color);
+      if (draw->samplers[i]) {
+         jit_tex->min_lod = draw->samplers[i]->min_lod;
+         jit_tex->max_lod = draw->samplers[i]->max_lod;
+         jit_tex->lod_bias = draw->samplers[i]->lod_bias;
+         COPY_4V(jit_tex->border_color, draw->samplers[i]->border_color);
+      }
    }
 }
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to