Mesa (master): i965: Drop a gratuitous "if" that the compiler didn' t eliminate at -O2.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue May 17 09:20:04 2011 -0700

i965: Drop a gratuitous "if" that the compiler didn't eliminate at -O2.

Oddly, this increases compiled code size.  (marking the 'if' as likely
also increases code size, but not as much).

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index a311176..f5c0694 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -539,16 +539,14 @@ prepare_wm_surfaces(struct brw_context *brw)
    int i;
    int nr_surfaces = 0;
 
-   if (ctx->DrawBuffer->_NumColorDrawBuffers >= 1) {
-      for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-	 struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[i];
-	 struct intel_renderbuffer *irb = intel_renderbuffer(rb);
-	 struct intel_region *region = irb ? irb->region : NULL;
-
-	 if (region)
-	    brw_add_validated_bo(brw, region->buffer);
-	 nr_surfaces = SURF_INDEX_DRAW(i) + 1;
-      }
+   for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
+      struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[i];
+      struct intel_renderbuffer *irb = intel_renderbuffer(rb);
+      struct intel_region *region = irb ? irb->region : NULL;
+
+      if (region)
+	 brw_add_validated_bo(brw, region->buffer);
+      nr_surfaces = SURF_INDEX_DRAW(i) + 1;
    }
 
    if (brw->wm.const_bo) {