From 5531f013269aeea9cd619bfac8bc2503f16f7dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Sun, 27 Jul 2025 20:12:12 -0400
Subject: [PATCH] nir: move list.h outside the glsl directory

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36425>
---
 src/asahi/compiler/agx_nir_lower_sample_mask.c | 2 +-
 src/compiler/glsl/meson.build                  | 1 -
 src/compiler/{glsl => }/list.h                 | 0
 src/compiler/meson.build                       | 1 +
 src/compiler/nir/nir.h                         | 2 +-
 src/compiler/nir/nir_builder.c                 | 2 +-
 src/imagination/pco/pco_trans_nir.c            | 2 +-
 src/mesa/main/shader_types.h                   | 2 +-
 src/mesa/program/prog_to_nir.c                 | 2 +-
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename src/compiler/{glsl => }/list.h (100%)

diff --git a/src/asahi/compiler/agx_nir_lower_sample_mask.c b/src/asahi/compiler/agx_nir_lower_sample_mask.c
index 9fccffceb64..b6f1920a9b8 100644
--- a/src/asahi/compiler/agx_nir_lower_sample_mask.c
+++ b/src/asahi/compiler/agx_nir_lower_sample_mask.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "compiler/glsl/list.h"
+#include "compiler/list.h"
 #include "compiler/nir/nir_builder.h"
 #include "agx_compiler.h"
 #include "nir.h"
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index 33bb81bcbe3..1b9a48ee333 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -165,7 +165,6 @@ files_libglsl = files(
   'ir_visitor.h',
   'linker_util.h',
   'linker_util.cpp',
-  'list.h',
   'lower_builtins.cpp',
   'lower_instructions.cpp',
   'lower_jumps.cpp',
diff --git a/src/compiler/glsl/list.h b/src/compiler/list.h
similarity index 100%
rename from src/compiler/glsl/list.h
rename to src/compiler/list.h
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 9776320e940..92e72a44f9a 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -29,6 +29,7 @@ astc_decoder_glsl_file = files('glsl/astc_decoder.glsl')
 files_libcompiler = files(
   'glsl_types.c',
   'glsl_types.h',
+  'list.h',
   'shader_enums.c',
   'shader_enums.h',
   'shader_info.h',
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index b5111e447e0..99e8f392a30 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 #include "compiler/glsl_types.h"
-#include "compiler/glsl/list.h"
+#include "compiler/list.h"
 #include "compiler/shader_enums.h"
 #include "compiler/shader_info.h"
 #include "util/bitset.h"
diff --git a/src/compiler/nir/nir_builder.c b/src/compiler/nir/nir_builder.c
index dda5b796b84..f9554d7f903 100644
--- a/src/compiler/nir/nir_builder.c
+++ b/src/compiler/nir/nir_builder.c
@@ -23,7 +23,7 @@
  */
 
 #include "nir_builder.h"
-#include "glsl/list.h"
+#include "list.h"
 #include "util/list.h"
 #include "util/ralloc.h"
 #include "glsl_types.h"
diff --git a/src/imagination/pco/pco_trans_nir.c b/src/imagination/pco/pco_trans_nir.c
index 75f9b964703..c3351bac1d1 100644
--- a/src/imagination/pco/pco_trans_nir.c
+++ b/src/imagination/pco/pco_trans_nir.c
@@ -10,7 +10,7 @@
  * \brief NIR translation functions.
  */
 
-#include "compiler/glsl/list.h"
+#include "compiler/list.h"
 #include "compiler/shader_enums.h"
 #include "hwdef/rogue_hw_defs.h"
 #include "pco.h"
diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h
index ba684677ba4..4f8a6cc3cf7 100644
--- a/src/mesa/main/shader_types.h
+++ b/src/mesa/main/shader_types.h
@@ -38,7 +38,7 @@
 #include "util/mesa-sha1.h"
 #include "util/mesa-blake3.h"
 #include "compiler/shader_info.h"
-#include "compiler/glsl/list.h"
+#include "compiler/list.h"
 #include "compiler/glsl/ir_list.h"
 
 #include "pipe/p_state.h"
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index a80934b128c..5b299757459 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -25,7 +25,7 @@
 
 #include "compiler/nir/nir.h"
 #include "compiler/nir/nir_builder.h"
-#include "compiler/glsl/list.h"
+#include "compiler/list.h"
 
 #include "main/mtypes.h"
 #include "main/shader_types.h"