AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: use VARYING_BIT_*

Browse Source 
Via Coccinelle patch generated by the following Python:

  varys = [ "POS", "COL0", "COL1", "FOGC", "TEX0", "TEX1", "TEX2", "TEX3", "TEX4",
           "TEX5", "TEX6", "TEX7", "PSIZ", "BFC0", "BFC1", "EDGE", "CLIP_VERTEX",
           "CLIP_DIST0", "CLIP_DIST1", "CULL_DIST0", "CULL_DIST1", "PRIMITIVE_ID",
           "PRIMITIVE_COUNT", "LAYER", "VIEWPORT", "FACE",
           "PRIMITIVE_SHADING_RATE", "PNTC", "TESS_LEVEL_OUTER",
           "TESS_LEVEL_INNER", "PRIMITIVE_INDICES", "BOUNDING_BOX0",
           "BOUNDING_BOX1", "VIEWPORT_MASK", "CULL_PRIMITIVE" ]
  t = """
  @@
  @@

  -(1 << VARYING_SLOT_${V})
  +VARYING_BIT_${V}

  @@
  @@

  -BITFIELD_BIT(VARYING_SLOT_${V})
  +VARYING_BIT_${V}

  @@
  @@

  -(1ull << VARYING_SLOT_${V})
  +VARYING_BIT_${V}

  @@
  @@

  -BITFIELD64_BIT(VARYING_SLOT_${V})
  +VARYING_BIT_${V}

  """
  for v in varys:
      from mako.template import Template
      print(Template(t).render(V = v))

Closes: #13453
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> [panfrost, common]
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com> [broadcom]
Reviewed-by: Corentin Noël <corentin.noel@collabora.com> [virgl]
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> [zink]
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35917>
This commit is contained in:
Alyssa Rosenzweig
2025-07-03 10:57:28 -04:00
committed by Marge Bot
parent 956d3f1562
commit d31cb824df
28 changed files with 86 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/compiler/vir.c
+2 -2
View File
@@ -826,7 +826,7 @@ v3d_vs_set_prog_data(struct v3d_compile *c,
prog_data->vpm_input_size++;
prog_data->writes_psiz =
c->s->info.outputs_written & (1 << VARYING_SLOT_PSIZ);
c->s->info.outputs_written & VARYING_BIT_PSIZ;
/* Input/output segment size are in sectors (8 rows of 32 bits per
* channel).
@@ -905,7 +905,7 @@ v3d_gs_set_prog_data(struct v3d_compile *c,
prog_data->num_invocations = c->s->info.gs.invocations;
prog_data->writes_psiz =
c->s->info.outputs_written & (1 << VARYING_SLOT_PSIZ);
c->s->info.outputs_written & VARYING_BIT_PSIZ;
}
static void
src/broadcom/vulkan/v3dv_meta_clear.c
+2 -3
View File
@@ -355,9 +355,8 @@ get_clear_rect_gs(const nir_shader_compiler_options *options,
nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_GEOMETRY, options,
"meta clear gs");
nir_shader *nir = b.shader;
nir->info.inputs_read = 1ull << VARYING_SLOT_POS;
nir->info.outputs_written = (1ull << VARYING_SLOT_POS) |
(1ull << VARYING_SLOT_LAYER);
nir->info.inputs_read = VARYING_BIT_POS;
nir->info.outputs_written = VARYING_BIT_POS | VARYING_BIT_LAYER;
nir->info.gs.input_primitive = MESA_PRIM_TRIANGLES;
nir->info.gs.output_primitive = MESA_PRIM_TRIANGLE_STRIP;
nir->info.gs.vertices_in = 3;
src/broadcom/vulkan/v3dv_meta_copy.c
+3 -3
View File
@@ -2240,9 +2240,9 @@ get_texel_buffer_copy_gs(const nir_shader_compiler_options *options)
nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_GEOMETRY, options,
"meta texel buffer copy gs");
nir_shader *nir = b.shader;
nir->info.inputs_read = 1ull << VARYING_SLOT_POS;
nir->info.outputs_written = (1ull << VARYING_SLOT_POS) |
(1ull << VARYING_SLOT_LAYER);
nir->info.inputs_read = VARYING_BIT_POS;
nir->info.outputs_written = VARYING_BIT_POS |
VARYING_BIT_LAYER;
nir->info.gs.input_primitive = MESA_PRIM_TRIANGLES;
nir->info.gs.output_primitive = MESA_PRIM_TRIANGLE_STRIP;
nir->info.gs.vertices_in = 3;
src/broadcom/vulkan/v3dv_pipeline.c
+3 -4
View File
@@ -1297,7 +1297,7 @@ pipeline_populate_v3d_gs_key(struct v3d_gs_key *key,
struct v3dv_pipeline *pipeline = p_stage->pipeline;
key->per_vertex_point_size =
p_stage->nir->info.outputs_written & (1ull << VARYING_SLOT_PSIZ);
p_stage->nir->info.outputs_written & VARYING_BIT_PSIZ;
key->is_coord = broadcom_shader_stage_is_binning(p_stage->stage);
@@ -1340,7 +1340,7 @@ pipeline_populate_v3d_vs_key(struct v3d_vs_key *key,
struct v3dv_pipeline *pipeline = p_stage->pipeline;
key->per_vertex_point_size =
p_stage->nir->info.outputs_written & (1ull << VARYING_SLOT_PSIZ);
p_stage->nir->info.outputs_written & VARYING_BIT_PSIZ;
key->is_coord = broadcom_shader_stage_is_binning(p_stage->stage);
@@ -2295,8 +2295,7 @@ pipeline_add_multiview_gs(struct v3dv_pipeline *pipeline,
"multiview broadcast gs");
nir_shader *nir = b.shader;
nir->info.inputs_read = vs_nir->info.outputs_written;
nir->info.outputs_written = vs_nir->info.outputs_written |
(1ull << VARYING_SLOT_LAYER);
nir->info.outputs_written = vs_nir->info.outputs_written | VARYING_BIT_LAYER;
uint32_t vertex_count = mesa_vertices_per_prim(pipeline->topology);
nir->info.gs.input_primitive =