nir/lower_tex: Simplify lower_gradient logic

Instead of having to call two different lower_gradient functions based
on whether or not it's a cube, just make lower_gradient handle cubes.
This significantly simplifies some of the logic.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c
index e10d4ea62f69e48bcb0b65c723081c8abeb19357..86da6537d2d4a972dc278969706e83f14ea6e366 100644 (file)
--- a/src/compiler/nir/nir_lower_tex.c
+++ b/src/compiler/nir/nir_lower_tex.c
@@ -562,6 +562,12 @@ lower_gradient_cube_map(nir_builder *b, nir_tex_instr *tex)
 static void
 lower_gradient(nir_builder *b, nir_tex_instr *tex)
 {
+   /* Cubes are more complicated and have their own function */
+   if (tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE) {
+      lower_gradient_cube_map(b, tex);
+      return;
+   }
+
    assert(tex->sampler_dim != GLSL_SAMPLER_DIM_CUBE);
    assert(tex->op == nir_texop_txd);
    assert(tex->dest.is_ssa);
@@ -831,20 +837,11 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
          progress = true;
       }
 
-      if (tex->op == nir_texop_txd &&
-          tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&
-          (options->lower_txd ||
-           options->lower_txd_cube_map ||
-           (tex->is_shadow && options->lower_txd_shadow))) {
-         lower_gradient_cube_map(b, tex);
-         progress = true;
-         continue;
-      }
-
       if (tex->op == nir_texop_txd &&
           (options->lower_txd ||
-           (options->lower_txd_shadow &&
-            tex->is_shadow && tex->sampler_dim != GLSL_SAMPLER_DIM_CUBE))) {
+           (options->lower_txd_shadow && tex->is_shadow) ||
+           (options->lower_txd_cube_map &&
+            tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE))) {
          lower_gradient(b, tex);
          progress = true;
          continue;