fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/nir: only consider overflow for valid feedback buffers

Browse source 
Otherwise the ordered operation above (ie. a GDS atomic return) might
return non-zero offsets for invalid buffers.

Fixes: f7076d129d ("amd: add nir_intrinsic_xfb_counter_sub_amd and fix overflowed streamout offsets")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25613>
This commit is contained in:
Samuel Pitoiset 2023-10-09 13:50:57 +02:00 • committed by Marge Bot
parent bbf135db3d
commit 052d12492d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/common/ac_nir_lower_ngg.c
View file

@ -1893,7 +1893,15 @@ ngg_build_streamout_buffer_info(nir_builder *b,
continue;
nir_def *buffer_size = nir_channel(b, so_buffer_ret[buffer], 2);
/* Only consider overflow for valid feedback buffers because
* otherwise the ordered operation above (GDS atomic return) might
* return non-zero offsets for invalid buffers.
*/
nir_def *buffer_valid = nir_ine_imm(b, buffer_size, 0);
nir_def *buffer_offset = nir_channel(b, buffer_offsets, buffer);
buffer_offset = nir_bcsel(b, buffer_valid, buffer_offset, nir_imm_int(b, 0));
nir_def *remain_size = nir_isub(b, buffer_size, buffer_offset);
nir_def *remain_prim = nir_idiv(b, remain_size, prim_stride_ret[buffer]);
nir_def *overflow = nir_ilt(b, buffer_size, buffer_offset);