pan/lib: Rename pan_compute_magic_divisor to pan_compute_npot_divisor

It's not that magical those days.

This also give proper names around the codebase for exponent and
epsilon.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Acked-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Olivia Lee <olivia.lee@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35490>
This commit is contained in:
Mary Guillemard 2025-06-11 23:22:50 +02:00
parent 5743bd703d
commit 0d9ac8f448
4 changed files with 15 additions and 15 deletions

View file

@ -2257,10 +2257,10 @@ panfrost_emit_vertex_data(struct panfrost_batch *batch, uint64_t *buffers)
}
} else {
unsigned shift = 0, extra_flags = 0;
unsigned divisor_r = 0, divisor_e = 0;
unsigned magic_divisor =
pan_compute_magic_divisor(hw_divisor, &shift, &extra_flags);
unsigned divisor_d =
pan_compute_npot_divisor(hw_divisor, &divisor_r, &divisor_e);
/* Records with continuations must be aligned */
k = ALIGN_POT(k, 2);
@ -2272,13 +2272,13 @@ panfrost_emit_vertex_data(struct panfrost_batch *batch, uint64_t *buffers)
cfg.stride = stride;
cfg.size = size;
cfg.divisor_r = shift;
cfg.divisor_e = extra_flags;
cfg.divisor_r = divisor_r;
cfg.divisor_e = divisor_e;
}
pan_cast_and_pack(&bufs[k + 1], ATTRIBUTE_BUFFER_CONTINUATION_NPOT,
cfg) {
cfg.divisor_numerator = magic_divisor;
cfg.divisor_numerator = divisor_d;
cfg.divisor = divisor;
}
@ -3841,7 +3841,7 @@ panfrost_pack_attribute(struct panfrost_device *dev,
cfg.attribute_type = MALI_ATTRIBUTE_TYPE_1D_NPOT_DIVISOR;
cfg.frequency = MALI_ATTRIBUTE_FREQUENCY_INSTANCE;
cfg.divisor_d = pan_compute_magic_divisor(
cfg.divisor_d = pan_compute_npot_divisor(
el.instance_divisor, &cfg.divisor_r, &cfg.divisor_e);
}
}

View file

@ -116,8 +116,8 @@ pan_padded_vertex_count(unsigned vertex_count)
}
static inline unsigned
pan_compute_magic_divisor(unsigned hw_divisor, unsigned *divisor_r,
unsigned *divisor_e)
pan_compute_npot_divisor(unsigned hw_divisor, unsigned *divisor_r,
unsigned *divisor_e)
{
unsigned r = util_logbase2(hw_divisor);
@ -168,8 +168,8 @@ pan_instance_id(unsigned padded_count,
/* Can't underflow since padded_count >= 2 */
cfg.divisor_r = __builtin_ctz(padded_count) - 1;
} else {
cfg.divisor_p = pan_compute_magic_divisor(padded_count, &cfg.divisor_r,
&cfg.divisor_e);
cfg.divisor_p = pan_compute_npot_divisor(padded_count, &cfg.divisor_r,
&cfg.divisor_e);
}
}
}

View file

@ -242,7 +242,7 @@ emit_vs_attrib(struct panvk_cmd_buffer *cmdbuf,
/* Per-instance, NPOT divisor */
cfg.attribute_type = MALI_ATTRIBUTE_TYPE_1D_NPOT_DIVISOR;
cfg.frequency = MALI_ATTRIBUTE_FREQUENCY_INSTANCE;
cfg.divisor_d = pan_compute_magic_divisor(
cfg.divisor_d = pan_compute_npot_divisor(
buf_info->divisor, &cfg.divisor_r, &cfg.divisor_e);
}
}

View file

@ -535,8 +535,8 @@ panvk_draw_emit_attrib_buf(const struct panvk_draw_data *draw,
}
} else {
unsigned divisor_r = 0, divisor_e = 0;
unsigned divisor_num =
pan_compute_magic_divisor(divisor, &divisor_r, &divisor_e);
unsigned divisor_d =
pan_compute_npot_divisor(divisor, &divisor_r, &divisor_e);
pan_pack(desc, ATTRIBUTE_BUFFER, cfg) {
cfg.type = MALI_ATTRIBUTE_TYPE_1D_NPOT_DIVISOR;
cfg.stride = stride;
@ -547,7 +547,7 @@ panvk_draw_emit_attrib_buf(const struct panvk_draw_data *draw,
}
pan_cast_and_pack(buf_ext, ATTRIBUTE_BUFFER_CONTINUATION_NPOT, cfg) {
cfg.divisor_numerator = divisor_num;
cfg.divisor_numerator = divisor_d;
cfg.divisor = buf_info->divisor;
}