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

radv: Fix swizzled VS input loads when some components are unused.

Browse Source 
Fix how out-of-bounds loads are decided.
It was incorrect because it mismatched the swizzle.
The decision is now made using the loaded num_components.

Fixes: 27c8131978
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8712
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22124>
This commit is contained in:
Timur Kristóf
2023-03-26 23:49:23 +02:00
committed by Marge Bot
parent 5bf6f6fed1
commit fd1e27a8f8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/amd/vulkan/radv_nir_lower_vs_inputs.c
View File

@@ -374,14 +374,20 @@ lower_load_vs_input(nir_builder *b, nir_intrinsic_instr *intrin, lower_vs_inputs
nir_ssa_def *channels[NIR_MAX_VEC_COMPONENTS] = {0};
for (unsigned i = 0; i < dest_num_components; ++i) {
const unsigned c = i + component;
if (!(dest_use_mask & BITFIELD_BIT(c))) {
/* Fill unused channels with zero. */
channels[i] = nir_imm_zero(b, 1, bit_size);
} else if (c < max_loaded_channels) {
continue;
}
const unsigned sw = f->swizzle[c];
assert(sw >= first_used_channel);
const unsigned loaded_channel = sw - first_used_channel;
if (load && loaded_channel < load->num_components) {
/* Use channels that were loaded from VRAM. */
const unsigned sw = f->swizzle[c];
assert(sw >= first_used_channel);
channels[i] = nir_channel(b, load, sw - first_used_channel);
channels[i] = nir_channel(b, load, loaded_channel);
if (alpha_adjust != AC_ALPHA_ADJUST_NONE && c == 3)
channels[i] = adjust_vertex_fetch_alpha(b, alpha_adjust, channels[i]);