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

st/mesa: handle lowered IO in st_nir_assign_vs_in_locations

Browse Source 
There are piglit failures without this.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6442>
This commit is contained in:
Marek Olšák
2020-08-14 01:32:00 -04:00
committed by Marge Bot
parent 2424485fb4
commit 2519472845
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_glsl_to_nir.cpp
+28 -1
View File
@@ -105,9 +105,36 @@ st_nir_assign_vs_in_locations(struct nir_shader *nir)
if (nir->info.stage != MESA_SHADER_VERTEX)
return;
nir->num_inputs = util_bitcount64(nir->info.inputs_read);
if (nir->info.io_lowered) {
/* Adjust the locations in load_input intrinsics. */
nir_foreach_function(f, nir) {
if (f->impl) {
nir_foreach_block(block, f->impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type == nir_instr_type_intrinsic) {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic == nir_intrinsic_load_input) {
unsigned base = nir_intrinsic_base(intrin);
unsigned loc = nir_intrinsic_io_semantics(intrin).location;
assert(nir->info.inputs_read & BITFIELD64_BIT(loc));
base = util_bitcount64(nir->info.inputs_read &
BITFIELD64_MASK(loc));
nir_intrinsic_set_base(intrin, base);
}
}
}
}
}
}
return;
}
bool removed_inputs = false;
nir->num_inputs = util_bitcount64(nir->info.inputs_read);
nir_foreach_shader_in_variable_safe(var, nir) {
/* NIR already assigns dual-slot inputs to two locations so all we have
* to do is compact everything down.