[Mesa-dev] [PATCH 17/23] st/mesa: Remove the PROG_PARAM_BIT_CYL_WRAP flag.

[Kenneth Graunke]

Nobody ever set the flag, which makes this dead code.  Also remove the
ureg_DECL_fs_input_cyl helper function, since it's now dead too.
---
 src/gallium/auxiliary/tgsi/tgsi_ureg.h   | 15 ---------------
 src/mesa/program/prog_parameter.h        |  8 --------
 src/mesa/state_tracker/st_mesa_to_tgsi.c | 17 ++++-------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index e6131f2..cbf1336 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -185,21 +185,6 @@ ureg_DECL_fs_input_cyl_centroid(struct ureg_program *,
                        unsigned centroid);
 
 static INLINE struct ureg_src
-ureg_DECL_fs_input_cyl(struct ureg_program *ureg,
-                       unsigned semantic_name,
-                       unsigned semantic_index,
-                       unsigned interp_mode,
-                       unsigned cylindrical_wrap)
-{
-   return ureg_DECL_fs_input_cyl_centroid(ureg,
-                                 semantic_name,
-                                 semantic_index,
-                                 interp_mode,
-                                 cylindrical_wrap,
-                                 0);
-}
-
-static INLINE struct ureg_src
 ureg_DECL_fs_input(struct ureg_program *ureg,
                    unsigned semantic_name,
                    unsigned semantic_index,
diff --git a/src/mesa/program/prog_parameter.h b/src/mesa/program/prog_parameter.h
index ef6731e..b12391f 100644
--- a/src/mesa/program/prog_parameter.h
+++ b/src/mesa/program/prog_parameter.h
@@ -41,14 +41,6 @@ extern "C" {
 
 
 /**
- * Program parameter flags
- */
-/*@{*/
-#define PROG_PARAM_BIT_CYL_WRAP  0x10  /**< XXX gallium debug */
-/*@}*/
-
-
-/**
  * Actual data for constant values of parameters.
  */
 typedef union gl_constant_value
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index e49cd7f..6224dc5 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1054,19 +1054,10 @@ st_translate_mesa_program(
     */
    if (procType == TGSI_PROCESSOR_FRAGMENT) {
       for (i = 0; i < numInputs; i++) {
-         if (program->InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {
-            t->inputs[i] = ureg_DECL_fs_input_cyl(ureg,
-                                                  inputSemanticName[i],
-                                                  inputSemanticIndex[i],
-                                                  interpMode[i],
-                                                  TGSI_CYLINDRICAL_WRAP_X);
-         }
-         else {
-            t->inputs[i] = ureg_DECL_fs_input(ureg,
-                                              inputSemanticName[i],
-                                              inputSemanticIndex[i],
-                                              interpMode[i]);
-         }
+         t->inputs[i] = ureg_DECL_fs_input(ureg,
+                                           inputSemanticName[i],
+                                           inputSemanticIndex[i],
+                                           interpMode[i]);
       }
 
       if (program->InputsRead & FRAG_BIT_WPOS) {
-- 
1.7.12.2