X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fshader_enums.c;h=0e28c5585c48026634a31bbe2b475a4588535539;hb=HEAD;hp=942d152b1296ad019f43517b1d6b32a57f03fb31;hpb=1a882fd2ee84ae28a06cf07902dc4645d8ad4a6d;p=mesa.git

diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c
index 942d152b129..0e28c5585c4 100644
--- a/src/compiler/shader_enums.c
+++ b/src/compiler/shader_enums.c
@@ -43,8 +43,9 @@ gl_shader_stage_name(gl_shader_stage stage)
       ENUM(MESA_SHADER_GEOMETRY),
       ENUM(MESA_SHADER_FRAGMENT),
       ENUM(MESA_SHADER_COMPUTE),
+      ENUM(MESA_SHADER_KERNEL),
    };
-   STATIC_ASSERT(ARRAY_SIZE(names) == MESA_SHADER_STAGES);
+   STATIC_ASSERT(ARRAY_SIZE(names) == MESA_ALL_SHADER_STAGES);
    return NAME(stage);
 }
 
@@ -60,6 +61,7 @@ _mesa_shader_stage_to_string(unsigned stage)
    case MESA_SHADER_FRAGMENT: return "fragment";
    case MESA_SHADER_GEOMETRY: return "geometry";
    case MESA_SHADER_COMPUTE:  return "compute";
+   case MESA_SHADER_KERNEL:   return "kernel";
    case MESA_SHADER_TESS_CTRL: return "tessellation control";
    case MESA_SHADER_TESS_EVAL: return "tessellation evaluation";
    }
@@ -79,6 +81,7 @@ _mesa_shader_stage_to_abbrev(unsigned stage)
    case MESA_SHADER_FRAGMENT: return "FS";
    case MESA_SHADER_GEOMETRY: return "GS";
    case MESA_SHADER_COMPUTE:  return "CS";
+   case MESA_SHADER_KERNEL:   return "CL";
    case MESA_SHADER_TESS_CTRL: return "TCS";
    case MESA_SHADER_TESS_EVAL: return "TES";
    }
@@ -91,7 +94,6 @@ gl_vert_attrib_name(gl_vert_attrib attrib)
 {
    static const char *names[] = {
       ENUM(VERT_ATTRIB_POS),
-      ENUM(VERT_ATTRIB_WEIGHT),
       ENUM(VERT_ATTRIB_NORMAL),
       ENUM(VERT_ATTRIB_COLOR0),
       ENUM(VERT_ATTRIB_COLOR1),
@@ -151,6 +153,8 @@ gl_varying_slot_name(gl_varying_slot slot)
       ENUM(VARYING_SLOT_CLIP_VERTEX),
       ENUM(VARYING_SLOT_CLIP_DIST0),
       ENUM(VARYING_SLOT_CLIP_DIST1),
+      ENUM(VARYING_SLOT_CULL_DIST0),
+      ENUM(VARYING_SLOT_CULL_DIST1),
       ENUM(VARYING_SLOT_PRIMITIVE_ID),
       ENUM(VARYING_SLOT_LAYER),
       ENUM(VARYING_SLOT_VIEWPORT),
@@ -158,6 +162,10 @@ gl_varying_slot_name(gl_varying_slot slot)
       ENUM(VARYING_SLOT_PNTC),
       ENUM(VARYING_SLOT_TESS_LEVEL_OUTER),
       ENUM(VARYING_SLOT_TESS_LEVEL_INNER),
+      ENUM(VARYING_SLOT_BOUNDING_BOX0),
+      ENUM(VARYING_SLOT_BOUNDING_BOX1),
+      ENUM(VARYING_SLOT_VIEW_INDEX),
+      ENUM(VARYING_SLOT_VIEWPORT_MASK),
       ENUM(VARYING_SLOT_VAR0),
       ENUM(VARYING_SLOT_VAR1),
       ENUM(VARYING_SLOT_VAR2),
@@ -199,39 +207,83 @@ const char *
 gl_system_value_name(gl_system_value sysval)
 {
    static const char *names[] = {
+     ENUM(SYSTEM_VALUE_SUBGROUP_SIZE),
+     ENUM(SYSTEM_VALUE_SUBGROUP_INVOCATION),
+     ENUM(SYSTEM_VALUE_SUBGROUP_EQ_MASK),
+     ENUM(SYSTEM_VALUE_SUBGROUP_GE_MASK),
+     ENUM(SYSTEM_VALUE_SUBGROUP_GT_MASK),
+     ENUM(SYSTEM_VALUE_SUBGROUP_LE_MASK),
+     ENUM(SYSTEM_VALUE_SUBGROUP_LT_MASK),
+     ENUM(SYSTEM_VALUE_NUM_SUBGROUPS),
+     ENUM(SYSTEM_VALUE_SUBGROUP_ID),
      ENUM(SYSTEM_VALUE_VERTEX_ID),
      ENUM(SYSTEM_VALUE_INSTANCE_ID),
+     ENUM(SYSTEM_VALUE_INSTANCE_INDEX),
      ENUM(SYSTEM_VALUE_VERTEX_ID_ZERO_BASE),
      ENUM(SYSTEM_VALUE_BASE_VERTEX),
+     ENUM(SYSTEM_VALUE_FIRST_VERTEX),
+     ENUM(SYSTEM_VALUE_IS_INDEXED_DRAW),
+     ENUM(SYSTEM_VALUE_BASE_INSTANCE),
+     ENUM(SYSTEM_VALUE_DRAW_ID),
      ENUM(SYSTEM_VALUE_INVOCATION_ID),
+     ENUM(SYSTEM_VALUE_FRAG_COORD),
+     ENUM(SYSTEM_VALUE_POINT_COORD),
+     ENUM(SYSTEM_VALUE_LINE_COORD),
      ENUM(SYSTEM_VALUE_FRONT_FACE),
      ENUM(SYSTEM_VALUE_SAMPLE_ID),
      ENUM(SYSTEM_VALUE_SAMPLE_POS),
      ENUM(SYSTEM_VALUE_SAMPLE_MASK_IN),
+     ENUM(SYSTEM_VALUE_HELPER_INVOCATION),
+     ENUM(SYSTEM_VALUE_COLOR0),
+     ENUM(SYSTEM_VALUE_COLOR1),
      ENUM(SYSTEM_VALUE_TESS_COORD),
      ENUM(SYSTEM_VALUE_VERTICES_IN),
      ENUM(SYSTEM_VALUE_PRIMITIVE_ID),
      ENUM(SYSTEM_VALUE_TESS_LEVEL_OUTER),
      ENUM(SYSTEM_VALUE_TESS_LEVEL_INNER),
+     ENUM(SYSTEM_VALUE_TESS_LEVEL_OUTER_DEFAULT),
+     ENUM(SYSTEM_VALUE_TESS_LEVEL_INNER_DEFAULT),
      ENUM(SYSTEM_VALUE_LOCAL_INVOCATION_ID),
+     ENUM(SYSTEM_VALUE_LOCAL_INVOCATION_INDEX),
+     ENUM(SYSTEM_VALUE_GLOBAL_INVOCATION_ID),
+     ENUM(SYSTEM_VALUE_BASE_GLOBAL_INVOCATION_ID),
+     ENUM(SYSTEM_VALUE_GLOBAL_INVOCATION_INDEX),
      ENUM(SYSTEM_VALUE_WORK_GROUP_ID),
      ENUM(SYSTEM_VALUE_NUM_WORK_GROUPS),
+     ENUM(SYSTEM_VALUE_LOCAL_GROUP_SIZE),
+     ENUM(SYSTEM_VALUE_GLOBAL_GROUP_SIZE),
+     ENUM(SYSTEM_VALUE_USER_DATA_AMD),
+     ENUM(SYSTEM_VALUE_WORK_DIM),
+     ENUM(SYSTEM_VALUE_DEVICE_INDEX),
+     ENUM(SYSTEM_VALUE_VIEW_INDEX),
      ENUM(SYSTEM_VALUE_VERTEX_CNT),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_SAMPLE),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_CENTROID),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_PERSP_SIZE),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_LINEAR_PIXEL),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_LINEAR_CENTROID),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_LINEAR_SAMPLE),
+     ENUM(SYSTEM_VALUE_BARYCENTRIC_PULL_MODEL),
+     ENUM(SYSTEM_VALUE_GS_HEADER_IR3),
+     ENUM(SYSTEM_VALUE_TCS_HEADER_IR3),
    };
    STATIC_ASSERT(ARRAY_SIZE(names) == SYSTEM_VALUE_MAX);
    return NAME(sysval);
 }
 
 const char *
-glsl_interp_qualifier_name(enum glsl_interp_qualifier qual)
+glsl_interp_mode_name(enum glsl_interp_mode qual)
 {
    static const char *names[] = {
-      ENUM(INTERP_QUALIFIER_NONE),
-      ENUM(INTERP_QUALIFIER_SMOOTH),
-      ENUM(INTERP_QUALIFIER_FLAT),
-      ENUM(INTERP_QUALIFIER_NOPERSPECTIVE),
+      ENUM(INTERP_MODE_NONE),
+      ENUM(INTERP_MODE_SMOOTH),
+      ENUM(INTERP_MODE_FLAT),
+      ENUM(INTERP_MODE_NOPERSPECTIVE),
+      ENUM(INTERP_MODE_EXPLICIT),
+      ENUM(INTERP_MODE_COLOR),
    };
-   STATIC_ASSERT(ARRAY_SIZE(names) == INTERP_QUALIFIER_COUNT);
+   STATIC_ASSERT(ARRAY_SIZE(names) == INTERP_MODE_COUNT);
    return NAME(qual);
 }