fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 21:30:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir: compute io base for fragment shader inputs which maybe per primitive
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Some inputs is per vertex while vertex pipeline, and per primitive
when mesh pipeline. Put these inputs after other inputs to share
the same fragment shader code for two pipelines.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36749>
This commit is contained in:
Qiang Yu 2025-07-25 16:31:20 +08:00 • committed by Marge Bot
parent 7c3f7e1046
commit dbbb46aa38
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/compiler/nir/nir_recompute_io_bases.c
View file

@ -93,13 +93,27 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
if (mode == nir_var_shader_in) {
for (unsigned i = 0; i < num_slots; i++) {
if (intr->intrinsic == nir_intrinsic_load_per_primitive_input)
BITSET_SET(per_prim_inputs, sem.location + i);
unsigned location = sem.location + i;
/* GPU like AMD require per primitive inputs come after per
* vertex inputs.
*/
if (intr->intrinsic == nir_intrinsic_load_per_primitive_input ||
/* Some fragment shader input varying is per vertex when vertex
* pipeline, per primitive when mesh pipeline. In order to share
* the same fragment shader code, we move these varyings after
* other per vertex varyings by handling them like per primitive
* varyings here.
*/
(nir->info.stage == MESA_SHADER_FRAGMENT &&
(location == VARYING_SLOT_PRIMITIVE_ID ||
location == VARYING_SLOT_VIEWPORT ||
location == VARYING_SLOT_LAYER)))
BITSET_SET(per_prim_inputs, location);
else
BITSET_SET(inputs, sem.location + i);
BITSET_SET(inputs, location);
if (sem.high_dvec2)
BITSET_SET(dual_slot_inputs, sem.location + i);
BITSET_SET(dual_slot_inputs, location);
}
} else if (!sem.dual_source_blend_index) {
for (unsigned i = 0; i < num_slots; i++)
@ -126,7 +140,7 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
num_slots = (num_slots + sem.high_16bits + 1) / 2;
if (mode == nir_var_shader_in) {
if (intr->intrinsic == nir_intrinsic_load_per_primitive_input) {
if (BITSET_TEST(per_prim_inputs, sem.location)){
nir_intrinsic_set_base(intr,
num_normal_inputs +
BITSET_PREFIX_SUM(per_prim_inputs, sem.location));