From e006f68b11ad7af8c0c4d7267ee04d9dfa1889a1 Mon Sep 17 00:00:00 2001
From: Natalie Vock <natalie.vock@gmx.de>
Date: Mon, 23 Jun 2025 15:54:47 +0200
Subject: [PATCH] aco/isel: Don't add scratch offset as gfx8- soffset if no
 offsets exist

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35031>
---
 .../instruction_selection/aco_select_nir_intrinsics.cpp        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/instruction_selection/aco_select_nir_intrinsics.cpp b/src/amd/compiler/instruction_selection/aco_select_nir_intrinsics.cpp
index 55f187e88ba..8b40ac210b0 100644
--- a/src/amd/compiler/instruction_selection/aco_select_nir_intrinsics.cpp
+++ b/src/amd/compiler/instruction_selection/aco_select_nir_intrinsics.cpp
@@ -3272,7 +3272,8 @@ visit_load_scratch(isel_context* ctx, nir_intrinsic_instr* instr)
       info.resource = load_scratch_resource(
          ctx->program, bld, ctx->program->private_segment_buffers.size() - 1, false);
       info.offset = Operand(as_vgpr(ctx, get_ssa_temp(ctx, instr->src[0].ssa)));
-      info.soffset = ctx->program->scratch_offsets.back();
+      if (!ctx->program->scratch_offsets.empty())
+         info.soffset = ctx->program->scratch_offsets.back();
       emit_load(ctx, bld, info, scratch_mubuf_load_params);
    }
 }