1 files changed, 15 insertions, 43 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_strings.c b/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_strings.c
index 26403508e..8271ea081 100644
--- a/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_strings.c
@@ -34,8 +34,8 @@
 
 const char *tgsi_processor_type_names[6] =
 {
-   "VERT",
    "FRAG",
+   "VERT",
    "GEOM",
    "TESS_CTRL",
    "TESS_EVAL",
@@ -52,11 +52,10 @@ static const char *tgsi_file_names[] =
    "SAMP",
    "ADDR",
    "IMM",
+   "PRED",
    "SV",
-   "IMAGE",
-   "SVIEW",
-   "BUFFER",
-   "MEMORY",
+   "RES",
+   "SVIEW"
 };
 
 const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
@@ -84,6 +83,7 @@ const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
    "PCOORD",
    "VIEWPORT_INDEX",
    "LAYER",
+   "CULLDIST",
    "SAMPLEID",
    "SAMPLEPOS",
    "SAMPLEMASK",
@@ -95,17 +95,6 @@ const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
    "TESSOUTER",
    "TESSINNER",
    "VERTICESIN",
-   "HELPER_INVOCATION",
-   "BASEINSTANCE",
-   "DRAWID",
-   "WORK_DIM",
-   "SUBGROUP_SIZE",
-   "SUBGROUP_INVOCATION",
-   "SUBGROUP_EQ_MASK",
-   "SUBGROUP_GE_MASK",
-   "SUBGROUP_GT_MASK",
-   "SUBGROUP_LE_MASK",
-   "SUBGROUP_LT_MASK",
 };
 
 const char *tgsi_texture_names[TGSI_TEXTURE_COUNT] =
@@ -148,14 +137,6 @@ const char *tgsi_property_names[TGSI_PROPERTY_COUNT] =
    "TES_SPACING",
    "TES_VERTEX_ORDER_CW",
    "TES_POINT_MODE",
-   "NUM_CLIPDIST_ENABLED",
-   "NUM_CULLDIST_ENABLED",
-   "FS_EARLY_DEPTH_STENCIL",
-   "NEXT_SHADER",
-   "CS_FIXED_BLOCK_WIDTH",
-   "CS_FIXED_BLOCK_HEIGHT",
-   "CS_FIXED_BLOCK_DEPTH",
-   "MUL_ZERO_WINS",
 };
 
 const char *tgsi_return_type_names[TGSI_RETURN_TYPE_COUNT] =
@@ -213,33 +194,24 @@ const char *tgsi_fs_coord_pixel_center_names[2] =
    "INTEGER"
 };
 
-const char *tgsi_immediate_type_names[6] =
+const char *tgsi_immediate_type_names[4] =
 {
    "FLT32",
    "UINT32",
    "INT32",
-   "FLT64",
-   "UINT64",
-   "INT64",
-};
-
-const char *tgsi_memory_names[3] =
-{
-   "COHERENT",
-   "RESTRICT",
-   "VOLATILE",
+   "FLT64"
 };
 
 
 static inline void
 tgsi_strings_check(void)
 {
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_semantic_names) == TGSI_SEMANTIC_COUNT);
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_texture_names) == TGSI_TEXTURE_COUNT);
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_property_names) == TGSI_PROPERTY_COUNT);
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_primitive_names) == PIPE_PRIM_MAX);
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_interpolate_names) == TGSI_INTERPOLATE_COUNT);
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_return_type_names) == TGSI_RETURN_TYPE_COUNT);
+   STATIC_ASSERT(Elements(tgsi_semantic_names) == TGSI_SEMANTIC_COUNT);
+   STATIC_ASSERT(Elements(tgsi_texture_names) == TGSI_TEXTURE_COUNT);
+   STATIC_ASSERT(Elements(tgsi_property_names) == TGSI_PROPERTY_COUNT);
+   STATIC_ASSERT(Elements(tgsi_primitive_names) == PIPE_PRIM_MAX);
+   STATIC_ASSERT(Elements(tgsi_interpolate_names) == TGSI_INTERPOLATE_COUNT);
+   STATIC_ASSERT(Elements(tgsi_return_type_names) == TGSI_RETURN_TYPE_COUNT);
    (void) tgsi_processor_type_names;
    (void) tgsi_return_type_names;
    (void) tgsi_immediate_type_names;
@@ -251,8 +223,8 @@ tgsi_strings_check(void)
 const char *
 tgsi_file_name(unsigned file)
 {
-   STATIC_ASSERT(ARRAY_SIZE(tgsi_file_names) == TGSI_FILE_COUNT);
-   if (file < ARRAY_SIZE(tgsi_file_names))
+   STATIC_ASSERT(Elements(tgsi_file_names) == TGSI_FILE_COUNT);
+   if (file < Elements(tgsi_file_names))
       return tgsi_file_names[file];
    else
       return "invalid file";