OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: take dual slot input info into account when computing IO driver locations

Browse Source 
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25394>
This commit is contained in:
Marek Olšák
2023-09-26 00:09:49 -04:00
committed by Marge Bot
parent 0f2491cbdd
commit cb66fddd81
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/nir/nir_lower_mediump.c
View File

@@ -67,8 +67,10 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
BITSET_DECLARE(inputs, NUM_TOTAL_VARYING_SLOTS); BITSET_DECLARE(inputs, NUM_TOTAL_VARYING_SLOTS);
BITSET_DECLARE(dual_slot_inputs, NUM_TOTAL_VARYING_SLOTS);
BITSET_DECLARE(outputs, NUM_TOTAL_VARYING_SLOTS); BITSET_DECLARE(outputs, NUM_TOTAL_VARYING_SLOTS);
BITSET_ZERO(inputs); BITSET_ZERO(inputs);
BITSET_ZERO(dual_slot_inputs);
BITSET_ZERO(outputs); BITSET_ZERO(outputs);
/* Gather the bitmasks of used locations. */ /* Gather the bitmasks of used locations. */
@@ -85,8 +87,11 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
num_slots = (num_slots + sem.high_16bits + 1) / 2; num_slots = (num_slots + sem.high_16bits + 1) / 2;
if (mode == nir_var_shader_in) { if (mode == nir_var_shader_in) {
for (unsigned i = 0; i < num_slots; i++) for (unsigned i = 0; i < num_slots; i++) {
BITSET_SET(inputs, sem.location + i); BITSET_SET(inputs, sem.location + i);
if (sem.high_dvec2)
BITSET_SET(dual_slot_inputs, sem.location + i);
}
} else if (!sem.dual_source_blend_index) { } else if (!sem.dual_source_blend_index) {
for (unsigned i = 0; i < num_slots; i++) for (unsigned i = 0; i < num_slots; i++)
BITSET_SET(outputs, sem.location + i); BITSET_SET(outputs, sem.location + i);
@@ -111,7 +116,9 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
if (mode == nir_var_shader_in) { if (mode == nir_var_shader_in) {
nir_intrinsic_set_base(intr, nir_intrinsic_set_base(intr,
BITSET_PREFIX_SUM(inputs, sem.location)); BITSET_PREFIX_SUM(inputs, sem.location) +
BITSET_PREFIX_SUM(dual_slot_inputs, sem.location) +
(sem.high_dvec2 ? 1 : 0));
} else if (sem.dual_source_blend_index) { } else if (sem.dual_source_blend_index) {
nir_intrinsic_set_base(intr, nir_intrinsic_set_base(intr,
BITSET_PREFIX_SUM(outputs, NUM_TOTAL_VARYING_SLOTS)); BITSET_PREFIX_SUM(outputs, NUM_TOTAL_VARYING_SLOTS));