From 7c306afdaad534cc4b474f07b4970bbf3ea46ff9 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 10 Dec 2007 22:02:04 +0000
Subject: gallium: remove unnecessary guards on qs->next

---
 src/mesa/pipe/softpipe/sp_quad_alpha_test.c | 3 +--
 src/mesa/pipe/softpipe/sp_quad_blend.c      | 3 +--
 src/mesa/pipe/softpipe/sp_quad_bufloop.c    | 3 +--
 src/mesa/pipe/softpipe/sp_quad_colormask.c  | 3 +--
 src/mesa/pipe/softpipe/sp_quad_coverage.c   | 3 +--
 src/mesa/pipe/softpipe/sp_quad_depth_test.c | 3 +--
 src/mesa/pipe/softpipe/sp_quad_earlyz.c     | 8 ++------
 src/mesa/pipe/softpipe/sp_quad_fs.c         | 3 +--
 src/mesa/pipe/softpipe/sp_quad_occlusion.c  | 6 ++----
 src/mesa/pipe/softpipe/sp_quad_output.c     | 3 +--
 src/mesa/pipe/softpipe/sp_quad_stencil.c    | 3 +--
 src/mesa/pipe/softpipe/sp_quad_stipple.c    | 3 +--
 12 files changed, 14 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
index 7b56bceba2..d056abe98d 100644
--- a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
@@ -84,8 +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)
-      qs->next->begin(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 1843e20684..17f3ecd0b8 100644
--- a/src/mesa/pipe/softpipe/sp_quad_blend.c
+++ b/src/mesa/pipe/softpipe/sp_quad_blend.c
@@ -726,8 +726,7 @@ 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);
+   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 e704b4043c..2ae4e22a7d 100644
--- a/src/mesa/pipe/softpipe/sp_quad_bufloop.c
+++ b/src/mesa/pipe/softpipe/sp_quad_bufloop.c
@@ -43,8 +43,7 @@ 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);
+   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 867cc0725a..1f09d900ca 100644
--- a/src/mesa/pipe/softpipe/sp_quad_colormask.c
+++ b/src/mesa/pipe/softpipe/sp_quad_colormask.c
@@ -87,8 +87,7 @@ 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);
+   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 cca2b9f79b..b3d3fae22f 100644
--- a/src/mesa/pipe/softpipe/sp_quad_coverage.c
+++ b/src/mesa/pipe/softpipe/sp_quad_coverage.c
@@ -65,8 +65,7 @@ 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);
+   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 93ea1196f9..1b8a2960af 100644
--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
@@ -253,8 +253,7 @@ 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);
+   qs->next->begin(qs->next);
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_earlyz.c b/src/mesa/pipe/softpipe/sp_quad_earlyz.c
index 89fab2dd35..3abd1f1fb9 100644
--- a/src/mesa/pipe/softpipe/sp_quad_earlyz.c
+++ b/src/mesa/pipe/softpipe/sp_quad_earlyz.c
@@ -56,18 +56,14 @@ earlyz_quad(
    quad->outputs.depth[2] = z0 + dzdy;
    quad->outputs.depth[3] = z0 + dzdx + dzdy;
 
-   if (qs->next) {
-      qs->next->run( qs->next, quad );
-   }
+   qs->next->run( qs->next, quad );
 }
 
 static void
 earlyz_begin(
    struct quad_stage *qs )
 {
-   if (qs->next) {
-      qs->next->begin( qs->next );
-   }
+   qs->next->begin( qs->next );
 }
 
 static void
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 1aba54d12a..75576a9bde 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -304,8 +304,7 @@ static void shade_begin(struct quad_stage *qs)
       }
    }
 
-   if (qs->next)
-      qs->next->begin(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 028d30c92f..d65fdbdab7 100644
--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -52,15 +52,13 @@ 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);
+   qs->next->run(qs->next, quad);
 }
 
 
 static void occlusion_begin(struct quad_stage *qs)
 {
-   if (qs->next)
-      qs->next->begin(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 bfd7baa946..cfe8f11808 100644
--- 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);
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_stencil.c b/src/mesa/pipe/softpipe/sp_quad_stencil.c
index b8c199204d..3f3eca078b 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stencil.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stencil.c
@@ -334,8 +334,7 @@ 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);
+   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 fcbbf00c7d..04d95989c4 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stipple.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stipple.c
@@ -60,8 +60,7 @@ 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);
+   qs->next->begin(qs->next);
 }
 
 
-- 
cgit v1.2.3