From 977f385e65600a97e213849e23e3108a873f3495 Mon Sep 17 00:00:00 2001
From: Konstantin Seurer <konstantin.seurer@gmail.com>
Date: Tue, 27 Jun 2023 13:01:08 +0200
Subject: [PATCH] r600: Use nir_builder_at

Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23883>
---
 src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp
index d74d73afcb0..6e2b14e5b04 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp
@@ -1224,10 +1224,9 @@ StoreMerger::combine_one_slot(vector<nir_intrinsic_instr *>& stores)
 {
    nir_ssa_def *srcs[4] = {nullptr};
 
-   nir_builder b = nir_builder_create(nir_shader_get_entrypoint(sh));
    auto last_store = *stores.rbegin();
 
-   b.cursor = nir_before_instr(&last_store->instr);
+   nir_builder b = nir_builder_at(nir_before_instr(&last_store->instr));
 
    unsigned comps = 0;
    unsigned writemask = 0;