glsl: Lower variable indexing of system value arrays unconditionally.

lower_variable_index_to_cond_assign() did not handle system values.
gl_SampleMaskIn[] is a system value, and also an array.  Accessing it
with a variable index would trigger an unreachable() assert.

Rather than adding a new EmitNoIndirectSystemValues flag, we simply
lower unconditionally.  There is exactly one case where this occurs,
and for all current drivers, lowering produces optimal code.  Even
for future drivers with 32x MSAA, it produces reasonable code.

Fixes Piglit's new samplemaskin-indirect test.  Also fixes many ES31-CTS
tests when OES_sample_variables is enabled.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp
index 278d5450bfb5643ba83918b910a84afb5dcc7b2b..fcb12d1b77d94f25b26cc611daa1e1a00072fcbf 100644 (file)
--- a/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp
+++ b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp
@@ -385,6 +385,26 @@ public:
       case ir_var_const_in:
          return this->lower_temps;
 
+      case ir_var_system_value:
+         /* There are only a few system values that have array types:
+          *
+          *    gl_TessLevelInner[]
+          *    gl_TessLevelOuter[]
+          *    gl_SampleMaskIn[]
+          *
+          * The tessellation factor arrays are lowered to vec4/vec2s
+          * by lower_tess_level() before this pass occurs, so we'll
+          * never see them here.
+          *
+          * The only remaining case is gl_SampleMaskIn[], which has
+          * a length of ceil(ctx->Const.MaxSamples / 32).  Most hardware
+          * supports no more than 32 samples, in which case our lowering
+          * produces a single read of gl_SampleMaskIn[0].  Even with 64x
+          * MSAA, the array length is only 2, so the lowering is fairly
+          * efficient.  Therefore, lower unconditionally.
+          */
+         return true;
+
       case ir_var_shader_in:
          /* The input array size is unknown at compiler time for non-patch
           * inputs in TCS and TES. The arrays are sized to