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

ac/nir: rename clip_cull_mask parameter to clearer export_clipdist_mask

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35352>
This commit is contained in:
Marek Olšák
2025-05-30 06:28:22 -04:00
committed by Marge Bot
parent ed0f393607
commit 8c04a91d12
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/common/nir/ac_nir.h
+2 -2
View File
@@ -266,7 +266,7 @@ typedef struct ac_nir_gs_output_info {
nir_shader *
ac_nir_create_gs_copy_shader(const nir_shader *gs_nir,
enum amd_gfx_level gfx_level,
uint32_t clip_cull_mask,
uint32_t export_clipdist_mask,
bool write_pos_to_clipvertex,
bool pack_clip_cull_distances,
const uint8_t *param_offsets,
@@ -280,7 +280,7 @@ ac_nir_create_gs_copy_shader(const nir_shader *gs_nir,
bool
ac_nir_lower_legacy_vs(nir_shader *nir,
enum amd_gfx_level gfx_level,
uint32_t clip_cull_mask,
uint32_t export_clipdist_mask,
bool write_pos_to_clipvertex,
bool pack_clip_cull_distances,
const uint8_t *param_offsets,
src/amd/common/nir/ac_nir_create_gs_copy_shader.c
+2 -2
View File
@@ -13,7 +13,7 @@
nir_shader *
ac_nir_create_gs_copy_shader(const nir_shader *gs_nir,
enum amd_gfx_level gfx_level,
uint32_t clip_cull_mask,
uint32_t export_clipdist_mask,
bool write_pos_to_clipvertex,
bool pack_clip_cull_distances,
const uint8_t *param_offsets,
@@ -120,7 +120,7 @@ ac_nir_create_gs_copy_shader(const nir_shader *gs_nir,
if (kill_layer)
export_outputs &= ~VARYING_BIT_LAYER;
ac_nir_export_position(&b, gfx_level, clip_cull_mask, write_pos_to_clipvertex, pack_clip_cull_distances,
ac_nir_export_position(&b, gfx_level, export_clipdist_mask, write_pos_to_clipvertex, pack_clip_cull_distances,
!has_param_exports, force_vrs, export_outputs, &out, NULL);
if (has_param_exports) {
src/amd/common/nir/ac_nir_helpers.h
+1 -1
View File
@@ -133,7 +133,7 @@ ac_nir_export_primitive(nir_builder *b, nir_def *prim, nir_def *row);
void
ac_nir_export_position(nir_builder *b,
enum amd_gfx_level gfx_level,
uint32_t clip_cull_mask,
uint32_t export_clipdist_mask,
bool write_pos_to_clipvertex,
bool pack_clip_cull_distances,
bool no_param_export,
src/amd/common/nir/ac_nir_lower_legacy_vs.c
+2 -2
View File
@@ -35,7 +35,7 @@ gather_outputs(nir_builder *b, nir_function_impl *impl, ac_nir_prerast_out *out)
bool
ac_nir_lower_legacy_vs(nir_shader *nir,
enum amd_gfx_level gfx_level,
uint32_t clip_cull_mask,
uint32_t export_clipdist_mask,
bool write_pos_to_clipvertex,
bool pack_clip_cull_distances,
const uint8_t *param_offsets,
@@ -78,7 +78,7 @@ ac_nir_lower_legacy_vs(nir_shader *nir,
if (kill_layer)
export_outputs &= ~VARYING_BIT_LAYER;
ac_nir_export_position(&b, gfx_level, clip_cull_mask, write_pos_to_clipvertex, pack_clip_cull_distances,
ac_nir_export_position(&b, gfx_level, export_clipdist_mask, write_pos_to_clipvertex, pack_clip_cull_distances,
!has_param_exports, force_vrs, export_outputs, &out, NULL);
if (has_param_exports) {
src/amd/common/nir/ac_nir_prerast_utils.c
+7 -7
View File
@@ -289,7 +289,7 @@ get_pos0_output(nir_builder *b, nir_def **output)
void
ac_nir_export_position(nir_builder *b,
enum amd_gfx_level gfx_level,
uint32_t clip_cull_mask,
uint32_t export_clipdist_mask,
bool write_pos_to_clipvertex,
bool pack_clip_cull_distances,
bool no_param_export,
@@ -331,13 +331,13 @@ ac_nir_export_position(nir_builder *b,
gl_varying_slot slot = write_pos_to_clipvertex ? VARYING_SLOT_POS : VARYING_SLOT_CLIP_VERTEX;
nir_def *vtx = get_export_output(b, out->outputs[slot]);
u_foreach_bit(i, clip_cull_mask) {
u_foreach_bit(i, export_clipdist_mask) {
nir_def *ucp = nir_load_user_clip_plane(b, .ucp_id = i);
clip_dist[i] = nir_fdot4(b, vtx, ucp);
}
} else {
/* Gather clip/cull distances. */
u_foreach_bit(i, clip_cull_mask) {
u_foreach_bit(i, export_clipdist_mask) {
assert(outputs_written & (VARYING_BIT_CLIP_DIST0 << (i / 4)));
clip_dist[i] = out->outputs[VARYING_SLOT_CLIP_DIST0 + i / 4][i % 4];
}
@@ -347,10 +347,10 @@ ac_nir_export_position(nir_builder *b,
if (pack_clip_cull_distances) {
unsigned num = 0;
u_foreach_bit(i, clip_cull_mask) {
u_foreach_bit(i, export_clipdist_mask) {
clip_dist[num++] = clip_dist[i];
}
clip_cull_mask = BITFIELD_MASK(num);
export_clipdist_mask = BITFIELD_MASK(num);
}
if (outputs_written & VARYING_BIT_POS) {
@@ -421,10 +421,10 @@ ac_nir_export_position(nir_builder *b,
}
for (int i = 0; i < 2; i++) {
if (clip_cull_mask & BITFIELD_RANGE(i * 4, 4)) {
if (export_clipdist_mask & BITFIELD_RANGE(i * 4, 4)) {
exp[exp_num] = export(b, get_export_output(b, clip_dist + i * 4), row,
V_008DFC_SQ_EXP_POS + exp_num + exp_pos_offset, 0,
(clip_cull_mask >> (i * 4)) & 0xf);
(export_clipdist_mask >> (i * 4)) & 0xf);
exp_num++;
}
}