From d7f72e4e5bef3d2694872a73a1f7f2baac91bf4a Mon Sep 17 00:00:00 2001
From: Thong Thai <thong.thai@amd.com>
Date: Mon, 11 May 2026 13:49:07 +0000
Subject: [PATCH] amd: Build nir files only when with_gfx_compute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thong Thai <thong.thai@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: Benjamin Cheng <benjamin.cheng@amd.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41494>
---
 src/amd/common/meson.build | 73 ++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index f84114e7617..6e3d605a57b 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -149,42 +149,47 @@ amd_common_files = files(
   'ac_video.h',
   'ac_video_dec.h',
   'ac_video_dec.c',
-  'nir/ac_nir.c',
-  'nir/ac_nir.h',
-  'nir/ac_nir_assign_io_locations.c',
-  'nir/ac_nir_helpers.h',
-  'nir/ac_nir_opt_outputs.c',
-  'nir/ac_nir_cull.c',
-  'nir/ac_nir_create_gs_copy_shader.c',
-  'nir/ac_nir_fixup_smem_loads_null_prt.c',
-  'nir/ac_nir_lower_esgs_io_to_mem.c',
-  'nir/ac_nir_lower_global_access.c',
-  'nir/ac_nir_lower_image_opcodes_cdna.c',
-  'nir/ac_nir_lower_image_tex.c',
-  'nir/ac_nir_lower_intrinsics_to_args.c',
-  'nir/ac_nir_lower_legacy_gs.c',
-  'nir/ac_nir_lower_legacy_vs.c',
-  'nir/ac_nir_lower_mem_access_bit_sizes.c',
-  'nir/ac_nir_lower_resinfo.c',
-  'nir/ac_nir_lower_taskmesh_io_to_mem.c',
-  'nir/ac_nir_lower_tess_io_to_mem.c',
-  'nir/ac_nir_lower_ngg.c',
-  'nir/ac_nir_lower_ngg_gs.c',
-  'nir/ac_nir_lower_ngg_mesh.c',
-  'nir/ac_nir_lower_ps_early.c',
-  'nir/ac_nir_lower_ps_late.c',
-  'nir/ac_nir_lower_tex_coords.c',
-  'nir/ac_nir_meta.h',
-  'nir/ac_nir_meta_cs_blit.c',
-  'nir/ac_nir_meta_cs_clear_copy_buffer.c',
-  'nir/ac_nir_meta_ps_resolve.c',
-  'nir/ac_nir_opt_flip_if_for_mem_loads.c',
-  'nir/ac_nir_opt_shared_append.c',
-  'nir/ac_nir_prerast_utils.c',
-  'nir/ac_nir_surface.c',
-  'nir/ac_nir_surface.h',
 ) + amd_ib_parsers
 
+if with_gfx_compute
+  amd_common_files += files(
+    'nir/ac_nir.c',
+    'nir/ac_nir.h',
+    'nir/ac_nir_assign_io_locations.c',
+    'nir/ac_nir_helpers.h',
+    'nir/ac_nir_opt_outputs.c',
+    'nir/ac_nir_cull.c',
+    'nir/ac_nir_create_gs_copy_shader.c',
+    'nir/ac_nir_fixup_smem_loads_null_prt.c',
+    'nir/ac_nir_lower_esgs_io_to_mem.c',
+    'nir/ac_nir_lower_global_access.c',
+    'nir/ac_nir_lower_image_opcodes_cdna.c',
+    'nir/ac_nir_lower_image_tex.c',
+    'nir/ac_nir_lower_intrinsics_to_args.c',
+    'nir/ac_nir_lower_legacy_gs.c',
+    'nir/ac_nir_lower_legacy_vs.c',
+    'nir/ac_nir_lower_mem_access_bit_sizes.c',
+    'nir/ac_nir_lower_resinfo.c',
+    'nir/ac_nir_lower_taskmesh_io_to_mem.c',
+    'nir/ac_nir_lower_tess_io_to_mem.c',
+    'nir/ac_nir_lower_ngg.c',
+    'nir/ac_nir_lower_ngg_gs.c',
+    'nir/ac_nir_lower_ngg_mesh.c',
+    'nir/ac_nir_lower_ps_early.c',
+    'nir/ac_nir_lower_ps_late.c',
+    'nir/ac_nir_lower_tex_coords.c',
+    'nir/ac_nir_meta.h',
+    'nir/ac_nir_meta_cs_blit.c',
+    'nir/ac_nir_meta_cs_clear_copy_buffer.c',
+    'nir/ac_nir_meta_ps_resolve.c',
+    'nir/ac_nir_opt_flip_if_for_mem_loads.c',
+    'nir/ac_nir_opt_shared_append.c',
+    'nir/ac_nir_prerast_utils.c',
+    'nir/ac_nir_surface.c',
+    'nir/ac_nir_surface.h',
+  )
+endif
+
 if not with_platform_windows
   amd_common_files += files(
     'ac_linux_drm.c',