From b4c91f086a66fdeb15cc8481e56f2cfd5813c8df Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 18 Feb 2022 15:44:13 +0200 Subject: [PATCH] intel/nir: disable assert on async stack id This can be accessed from : - RT shaders - CS trampoline shader We missed the second part here. Fixes: 046571479028 ("intel/nir/rt: add more helpers for ray queries") Signed-off-by: Lionel Landwerlin Reviewed-by: Caio Oliveira Part-of: (cherry picked from commit 57593c539529f0b06c2395d1882e6e6d6477362a) --- .pick_status.json | 2 +- src/intel/compiler/brw_nir_rt_builder.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4747f8dcc40..61ac8e3a880 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -472,7 +472,7 @@ "description": "intel/nir: disable assert on async stack id", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "046571479028aeb5577344a91f0c4d565415f4bc" }, diff --git a/src/intel/compiler/brw_nir_rt_builder.h b/src/intel/compiler/brw_nir_rt_builder.h index 6743684b111..16673901582 100644 --- a/src/intel/compiler/brw_nir_rt_builder.h +++ b/src/intel/compiler/brw_nir_rt_builder.h @@ -90,8 +90,6 @@ brw_load_eu_thread_simd(nir_builder *b) static inline nir_ssa_def * brw_nir_rt_async_stack_id(nir_builder *b) { - assert(gl_shader_stage_is_callable(b->shader->info.stage) || - b->shader->info.stage == MESA_SHADER_RAYGEN); return nir_iadd(b, nir_umul_32x16(b, nir_load_ray_num_dss_rt_stacks_intel(b), brw_load_btd_dss_id(b)), nir_load_btd_stack_id_intel(b));