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

nir/lower_ssbo: Don't set align_* for atomics

Browse Source 
Fixes crashes when lowering atomic SSBOs:

   run: ../src/compiler/nir/nir.h:1875: nir_intrinsic_align_mul: Assertion `info->index_map[NIR_INTRINSIC_ALIGN_MUL] > 0' failed.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6204>
This commit is contained in:
Alyssa Rosenzweig
2020-08-06 09:13:32 -04:00
committed by Marge Bot
parent 2d010d3dc5
commit 5cf7eec6b1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_lower_ssbo.c
View File

@@ -128,8 +128,10 @@ lower_ssbo_instr(nir_builder *b, nir_intrinsic_instr *intr)
global->num_components = intr->num_components;
global->src[is_store ? 1 : 0] = nir_src_for_ssa(address);
nir_intrinsic_set_align_mul(global, nir_intrinsic_align_mul(intr));
nir_intrinsic_set_align_offset(global, nir_intrinsic_align_offset(intr));
if (!is_atomic) {
nir_intrinsic_set_align_mul(global, nir_intrinsic_align_mul(intr));
nir_intrinsic_set_align_offset(global, nir_intrinsic_align_offset(intr));
}
if (is_store) {
nir_src_copy(&global->src[0], &intr->src[0], global);