fix qs->next tests

diff --git a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
index 585adb41fe590ae384dff47b84404e38157d53fc..1c519070787b75b2e8e68ce6dc80858390c5cf0a 100644 (file)
--- 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 ad21c27b2f05b40f927f741c17234a3ca82ead55..09d0aa258c75ac55189b8766fbb7d51eaef44f29 100644 (file)
--- 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 91c4b70794bc2672ee5d65f721afccc8b2749e17..c459a9e8b07f5032793826c2533ab00408c28ad9 100644 (file)
--- 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 da5ed8f27c040d4a65f3de9f3011f80d5e13c84d..5102a000b5289d4d2b33248737f0cee98ca6b209 100644 (file)
--- 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 f166276e840ba34e1ab859eb9d37aa8ddc9f0676..efeb85aab98d173026d8d07cd3833d73944a663d 100644 (file)
--- 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 904d93a614c5900fbd30b66688a3bd192ac271f9..28f264b3c4a298beb7562686448f88b26397afa5 100644 (file)
--- 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 5e4782ca4874c8976f398d29e3f6d49594d0c74d..e5ab0ebc1667ec2769859f623dfc5041f333d546 100644 (file)
--- 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 0fc1acbf2f8924e1b7ee4240f9631701e9f6b734..8073f94553aba32acabff7ee9a5bc75562727b2d 100644 (file)
--- 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 49161993e6b6b93eb4e6023bdf7c18d187d5438d..62f466be5d0b0e17316b8afe1515f8653b5f5771 100644 (file)
--- 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 6a9ea9069d027a9c3276020f1c8f795328692da5..857f1a5989b268ca7d7f84d401770ae00555671e 100644 (file)
--- 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 286eb1cd954843a4d2a77fa0e3a959935f742014..6e93bf81f1c1260f4307fe631923b0892aab4efe 100644 (file)
--- 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);
 }