From ce70d51e83a14a959b740deec3de5b306ae9a6e9 Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Wed, 28 Aug 2024 19:01:33 +0200
Subject: [PATCH] nir/opt_sink: do not sink load_ubo_vec4 out of loops
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Same reason as for load_ubo.

Fixes: d199d65c3af ("nir/nir_opt_move,sink: Include load_ubo_vec4 as a load_ubo instr.")

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30906>
(cherry picked from commit 1ec3cc2aed4f8381879ac52e09aafb977e9aabdf)
---
 .pick_status.json               | 2 +-
 src/compiler/nir/nir_opt_sink.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 517f56a0732..df024a0562f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1184,7 +1184,7 @@
         "description": "nir/opt_sink: do not sink load_ubo_vec4 out of loops",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d199d65c3af6cc87cd77585b21435ddb5125654d",
         "notes": null
diff --git a/src/compiler/nir/nir_opt_sink.c b/src/compiler/nir/nir_opt_sink.c
index 126a9d5fe2c..ecf822cebc5 100644
--- a/src/compiler/nir/nir_opt_sink.c
+++ b/src/compiler/nir/nir_opt_sink.c
@@ -252,6 +252,7 @@ can_sink_out_of_loop(nir_intrinsic_instr *intrin)
     * by nir_lower_non_uniform_access.
     */
    return intrin->intrinsic != nir_intrinsic_load_ubo &&
+          intrin->intrinsic != nir_intrinsic_load_ubo_vec4 &&
           intrin->intrinsic != nir_intrinsic_load_ssbo;
 }