Mesa (master): Revert "nir: Support sysval tess levels in SPIR-V to NIR"

[GitLab Mirror]

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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Fri Jul  3 22:11:16 2020 -0400

Revert "nir: Support sysval tess levels in SPIR-V to NIR"

This reverts commit d2d4677b56efa0003065b61e39c1ef977c83f7da.

The option is not used by any driver.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5744>

---

 src/compiler/spirv/nir_spirv.h     |  5 -----
 src/compiler/spirv/vtn_variables.c | 16 ++--------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index acfcc084f41..3d6f74e43ca 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -64,11 +64,6 @@ struct spirv_to_nir_options {
     */
    bool frag_coord_is_sysval;
 
-   /* Whether to lower TessLevelInner and TessLevelOuter to system values.
-    * This is the inverse of GLSLTessLevelsAsInputs in GLSL.
-    */
-   bool tess_levels_are_sysvals;
-
    struct spirv_supported_capabilities caps;
 
    /* Address format for various kinds of pointers. */
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 837a0abaadd..504f5c742d6 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1354,22 +1354,10 @@ vtn_get_builtin_location(struct vtn_builder *b,
          vtn_fail("invalid stage for SpvBuiltInViewportIndex");
       break;
    case SpvBuiltInTessLevelOuter:
-      if (b->options && b->options->tess_levels_are_sysvals &&
-          *mode == nir_var_shader_in) {
-         *location = SYSTEM_VALUE_TESS_LEVEL_OUTER;
-         set_mode_system_value(b, mode);
-      } else {
-         *location = VARYING_SLOT_TESS_LEVEL_OUTER;
-      }
+      *location = VARYING_SLOT_TESS_LEVEL_OUTER;
       break;
    case SpvBuiltInTessLevelInner:
-      if (b->options && b->options->tess_levels_are_sysvals &&
-          *mode == nir_var_shader_in) {
-         *location = SYSTEM_VALUE_TESS_LEVEL_INNER;
-         set_mode_system_value(b, mode);
-      } else {
-         *location = VARYING_SLOT_TESS_LEVEL_INNER;
-      }
+      *location = VARYING_SLOT_TESS_LEVEL_INNER;
       break;
    case SpvBuiltInTessCoord:
       *location = SYSTEM_VALUE_TESS_COORD;