From 5e05d98848cfc04a38cd893b77c3f7d6a6288009 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Tue, 25 Oct 2022 11:07:24 -0500
Subject: [PATCH] nir: Unconditionally call nir_trim_vector in
 nir_lower_readonly_images_to_tex

It will already short-circuit if the number of components matches.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19301>
---
 src/compiler/nir/nir_lower_readonly_images_to_tex.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/compiler/nir/nir_lower_readonly_images_to_tex.c b/src/compiler/nir/nir_lower_readonly_images_to_tex.c
index 796b130dfca..39d45551191 100644
--- a/src/compiler/nir/nir_lower_readonly_images_to_tex.c
+++ b/src/compiler/nir/nir_lower_readonly_images_to_tex.c
@@ -179,11 +179,8 @@ lower_readonly_image_instr(nir_builder *b, nir_instr *instr, void *context)
 
    nir_builder_instr_insert(b, &tex->instr);
 
-   nir_ssa_def *res = &tex->dest.ssa;
-   if (res->num_components != intrin->dest.ssa.num_components) {
-      unsigned num_components = intrin->dest.ssa.num_components;
-      res = nir_trim_vector(b, res, num_components);
-   }
+   nir_ssa_def *res = nir_trim_vector(b, &tex->dest.ssa,
+                                      intrin->dest.ssa.num_components);
 
    nir_ssa_def_rewrite_uses(&intrin->dest.ssa, res);
    nir_instr_remove(&intrin->instr);