summaryrefslogtreecommitdiff
path: root/src/amd
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2024-08-19 08:42:06 +0200
committerEric Engestrom <eric@engestrom.ch>2024-08-20 18:42:17 +0200
commit04ba8d0f92e2c722ccc7798720bcc5382c4261df (patch)
treed1a45c72a054fc4126df8422dc3becf25f36fbfe /src/amd
parent53d99c4847bdabd5701d9cd783edc00fbadda99a (diff)
aco: fix bogus assert in RT prolog on GFX11+
in_scratch_offset isn't defined on GFX11+ and only useful on < GFX9. Fixes: bd525f42823 ("aco: Fix 1D->2D dispatch conversion on <gfx9") Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30717> (cherry picked from commit aad503ecfa93f0e34314340c1f4c0c9e3526a0a0)
Diffstat (limited to 'src/amd')
-rw-r--r--src/amd/compiler/aco_instruction_selection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 51f4bb60b7e..2acb6b74636 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -12583,7 +12583,7 @@ select_rt_prolog(Program* program, ac_shader_config* config,
/* <gfx9 reads in_scratch_offset at the end of the prolog to write out the scratch_offset
* arg. Make sure no other outputs have overwritten it by then.
*/
- assert(in_scratch_offset.reg() >= out_args->num_sgprs_used);
+ assert(options->gfx_level >= GFX9 || in_scratch_offset.reg() >= out_args->num_sgprs_used);
/* load raygen sbt */
bld.smem(aco_opcode::s_load_dwordx2, Definition(tmp_raygen_sbt, s2), Operand(in_sbt_desc, s2),