i965/vs: Fix user clip plane setup on Gen4-5.

On Gen6-7, we don't compact clip planes, and nr_userclip_plane_consts
is the last bit set, so iterating from i = 0..nr_userclip_plane_consts
covers all active clip planes and is the right thing to do.
works and is the right thing to do.

However, that doesn't work at all on Gen4-5.  Since we don't compact
clip planes, we skip over ones which aren't active (via the continue
statement).  We also set set nr_userclip_plane_consts to the number of
active clip planes, which means that we end the loop after checking that
many bits.  If the set of clip planes wasn't contiguous, this means we'd
fail to find the last few.

By changing the iteration to MAX_CLIP_PLANES, we correctly find all of
the active clip planes.

Fixes regressions since 66c8473e028d (replacing the old VS backend) in
Piglit's spec/glsl-1.20/execution/clipping/fixed-clip-enables and
oglconform's mustpass(basic.clip) and userclip(basic.allCases).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56791
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 325ef0d6e1b4980460de99ee70bb5683ea074907..72766a2c29debbe0dfc8c08f9a113851bb0fb964 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -534,11 +534,10 @@ vec4_visitor::setup_uniform_clipplane_values()
        * thread.
        */
       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))) {
+      for (int i = 0; i < MAX_CLIP_PLANES; ++i) {
+        if (!(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;