gallium: remove unnecessary guards on qs->next

2007-12-10 22:02:04 +00:00
parent e53303ba3b
commit 7c306afdaa
12 changed files with 14 additions and 30 deletions
--- a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
@@ -84,7 +84,6 @@ alpha_test_quad(struct quad_stage *qs, struct quad_header *quad)

 static void alpha_test_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_blend.c
+++ b/src/mesa/pipe/softpipe/sp_quad_blend.c
@@ -726,7 +726,6 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)

 static void blend_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_bufloop.c
+++ b/src/mesa/pipe/softpipe/sp_quad_bufloop.c
@@ -43,7 +43,6 @@ cbuf_loop_quad(struct quad_stage *qs, struct quad_header *quad)

 static void cbuf_loop_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_colormask.c
+++ b/src/mesa/pipe/softpipe/sp_quad_colormask.c
@@ -87,7 +87,6 @@ colormask_quad(struct quad_stage *qs, struct quad_header *quad)

 static void colormask_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_coverage.c
+++ b/src/mesa/pipe/softpipe/sp_quad_coverage.c
@@ -65,7 +65,6 @@ coverage_quad(struct quad_stage *qs, struct quad_header *quad)

 static void coverage_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
@@ -253,7 +253,6 @@ depth_test_quad(struct quad_stage *qs, struct quad_header *quad)

 static void depth_test_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_earlyz.c
+++ b/src/mesa/pipe/softpipe/sp_quad_earlyz.c
@@ -56,19 +56,15 @@ earlyz_quad(
   quad->outputs.depth[2] = z0 + dzdy;
   quad->outputs.depth[3] = z0 + dzdx + dzdy;

-   if (qs->next) {
   qs->next->run( qs->next, quad );
 }
-}

 static void
 earlyz_begin(
   struct quad_stage *qs )
 {
-   if (qs->next) {
   qs->next->begin( qs->next );
 }
-}

 static void
 earlyz_destroy(
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -304,7 +304,6 @@ static void shade_begin(struct quad_stage *qs)
      }
   }

-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -52,14 +52,12 @@ occlusion_count_quad(struct quad_stage *qs, struct quad_header *quad)
   occ->count += (quad->mask >> 2) & 1;
   occ->count += (quad->mask >> 3) & 1;

-   if (quad->mask)
   qs->next->run(qs->next, quad);
 }


 static void occlusion_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_output.c
+++ b/src/mesa/pipe/softpipe/sp_quad_output.c
@@ -67,8 +67,7 @@ output_quad(struct quad_stage *qs, struct quad_header *quad)

 static void output_begin(struct quad_stage *qs)
 {
-   if (qs->next)
-      qs->next->begin(qs->next);
+   assert(qs->next == NULL);
 }


--- a/src/mesa/pipe/softpipe/sp_quad_stencil.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stencil.c
@@ -334,7 +334,6 @@ stencil_test_quad(struct quad_stage *qs, struct quad_header *quad)

 static void stencil_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }

--- a/src/mesa/pipe/softpipe/sp_quad_stipple.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stipple.c
@@ -60,7 +60,6 @@ stipple_quad(struct quad_stage *qs, struct quad_header *quad)

 static void stipple_begin(struct quad_stage *qs)
 {
-   if (qs->next)
   qs->next->begin(qs->next);
 }