mesa: rename program parameter flags to match other Mesa conventions

(cherry picked from commit f490ec9797a396da9d182f1ad4393f1c5c2df440)

diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h
index a8ef0561f7aff4b2532453c34cc411682176f057..200f2c00458093c619e4267a61148232ec7bedde 100644 (file)
--- a/src/mesa/shader/prog_parameter.h
+++ b/src/mesa/shader/prog_parameter.h
@@ -39,10 +39,10 @@
  * Program parameter flags
  */
 /*@{*/
-#define PROG_PARAM_CENTROID_BIT   0x1  /**< for varying vars (GLSL 1.20) */
-#define PROG_PARAM_INVARIANT_BIT  0x2  /**< for varying vars (GLSL 1.20) */
-#define PROG_PARAM_FLAT_BIT       0x4  /**< for varying vars (GLSL 1.30) */
-#define PROG_PARAM_LINEAR_BIT     0x8  /**< for varying vars (GLSL 1.30) */
+#define PROG_PARAM_BIT_CENTROID   0x1  /**< for varying vars (GLSL 1.20) */
+#define PROG_PARAM_BIT_INVARIANT  0x2  /**< for varying vars (GLSL 1.20) */
+#define PROG_PARAM_BIT_FLAT       0x4  /**< for varying vars (GLSL 1.30) */
+#define PROG_PARAM_BIT_LINEAR     0x8  /**< for varying vars (GLSL 1.30) */
 /*@}*/
 
 

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 7049c3c9d06e6307a1fe1ca37a83a6aafc2d3f34..29b4d90a3e8b65ee113afb50a97ff5742bf30fb2 100644 (file)
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -818,13 +818,13 @@ _mesa_print_parameter_list(const struct gl_program_parameter_list *list)
                    i, param->Size,
                    file_string(list->Parameters[i].Type, mode),
                    param->Name, v[0], v[1], v[2], v[3]);
-      if (param->Flags & PROG_PARAM_CENTROID_BIT)
+      if (param->Flags & PROG_PARAM_BIT_CENTROID)
          _mesa_printf(" Centroid");
-      if (param->Flags & PROG_PARAM_INVARIANT_BIT)
+      if (param->Flags & PROG_PARAM_BIT_INVARIANT)
          _mesa_printf(" Invariant");
-      if (param->Flags & PROG_PARAM_FLAT_BIT)
+      if (param->Flags & PROG_PARAM_BIT_FLAT)
          _mesa_printf(" Flat");
-      if (param->Flags & PROG_PARAM_LINEAR_BIT)
+      if (param->Flags & PROG_PARAM_BIT_LINEAR)
          _mesa_printf(" Linear");
       _mesa_printf("\n");
    }