From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 7 Nov 2012 06:23:04 +0000 (-0800)
Subject: i965/vs: Simplify the Gen6-7 part of setup_uniform_clipplane_values().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32628578439ea43bb55b3827e13351d96f7c2b0c;p=mesa.git

i965/vs: Simplify the Gen6-7 part of setup_uniform_clipplane_values().

There's no compaction, so we can drop that code and simply use 'i'.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index c68ff802f3e..325ef0d6e1b 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -552,19 +552,13 @@ vec4_visitor::setup_uniform_clipplane_values()
       /* In Gen6 and later, we don't compact clip planes, because this
        * simplifies the implementation of gl_ClipDistance.
        */
-      int compacted_clipplane_index = 0;
       for (int i = 0; i < c->key.nr_userclip_plane_consts; ++i) {
-	 if (intel->gen < 6 &&
-	     !(c->key.userclip_planes_enabled_gen_4_5 & (1 << i))) {
-	    continue;
-	 }
 	 this->uniform_vector_size[this->uniforms] = 4;
-	 this->userplane[compacted_clipplane_index] = dst_reg(UNIFORM, this->uniforms);
-	 this->userplane[compacted_clipplane_index].type = BRW_REGISTER_TYPE_F;
+	 this->userplane[i] = dst_reg(UNIFORM, this->uniforms);
+	 this->userplane[i].type = BRW_REGISTER_TYPE_F;
 	 for (int j = 0; j < 4; ++j) {
 	    c->prog_data.param[this->uniforms * 4 + j] = &clip_planes[i][j];
 	 }
-	 ++compacted_clipplane_index;
 	 ++this->uniforms;
       }
    }