11 files changed, 13 insertions, 11 deletions
diff --git a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
index 585adb41fe..1c51907078 100644
--- a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
@@ -84,7 +84,7 @@ alpha_test_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void alpha_test_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_blend.c b/src/mesa/pipe/softpipe/sp_quad_blend.c
index ad21c27b2f..09d0aa258c 100644
--- a/src/mesa/pipe/softpipe/sp_quad_blend.c
+++ b/src/mesa/pipe/softpipe/sp_quad_blend.c
@@ -384,7 +384,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void blend_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_bufloop.c b/src/mesa/pipe/softpipe/sp_quad_bufloop.c
index 91c4b70794..c459a9e8b0 100644
--- a/src/mesa/pipe/softpipe/sp_quad_bufloop.c
+++ b/src/mesa/pipe/softpipe/sp_quad_bufloop.c
@@ -47,7 +47,7 @@ cbuf_loop_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void cbuf_loop_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_colormask.c b/src/mesa/pipe/softpipe/sp_quad_colormask.c
index da5ed8f27c..5102a000b5 100644
--- a/src/mesa/pipe/softpipe/sp_quad_colormask.c
+++ b/src/mesa/pipe/softpipe/sp_quad_colormask.c
@@ -73,7 +73,7 @@ colormask_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void colormask_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_coverage.c b/src/mesa/pipe/softpipe/sp_quad_coverage.c
index f166276e84..efeb85aab9 100644
--- a/src/mesa/pipe/softpipe/sp_quad_coverage.c
+++ b/src/mesa/pipe/softpipe/sp_quad_coverage.c
@@ -65,7 +65,7 @@ coverage_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void coverage_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_depth_test.c b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
index 904d93a614..28f264b3c4 100644
--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
@@ -158,7 +158,7 @@ depth_test_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void depth_test_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 5e4782ca48..e5ab0ebc16 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -323,9 +323,11 @@ static void shade_begin(struct quad_stage *qs)
       qss->samplers[i].get_sample = sp_get_sample;
       qss->samplers[i].pipe = &softpipe->pipe;
       /* init cache info here */
+      qss->samplers[i].cache_x =
+      qss->samplers[i].cache_y = -1;
    }
 
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
index 0fc1acbf2f..8073f94553 100644
--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -58,7 +58,7 @@ occlusion_count_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void occlusion_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_output.c b/src/mesa/pipe/softpipe/sp_quad_output.c
index 49161993e6..62f466be5d 100644
--- a/src/mesa/pipe/softpipe/sp_quad_output.c
+++ b/src/mesa/pipe/softpipe/sp_quad_output.c
@@ -86,7 +86,7 @@ output_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void output_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_stencil.c b/src/mesa/pipe/softpipe/sp_quad_stencil.c
index 6a9ea9069d..857f1a5989 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stencil.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stencil.c
@@ -277,7 +277,7 @@ stencil_test_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void stencil_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/mesa/pipe/softpipe/sp_quad_stipple.c
index 286eb1cd95..6e93bf81f1 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stipple.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stipple.c
@@ -38,7 +38,7 @@ stipple_quad(struct quad_stage *qs, struct quad_header *quad)
 
 static void stipple_begin(struct quad_stage *qs)
 {
-   if (qs->next->begin)
+   if (qs->next)
       qs->next->begin(qs->next);
 }