From f997d32f9f6a040f4956e067a4914a9584cbd424 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 21 Jul 2023 18:30:53 +0100
Subject: [PATCH] asahi: drop unused include paths

Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24287>
---
 src/asahi/compiler/meson.build | 2 --
 src/asahi/drm-shim/meson.build | 2 +-
 src/asahi/layout/meson.build   | 3 +--
 src/asahi/lib/meson.build      | 7 ++-----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/asahi/compiler/meson.build b/src/asahi/compiler/meson.build
index 0c6ab53..57770de 100644
--- a/src/asahi/compiler/meson.build
+++ b/src/asahi/compiler/meson.build
@@ -82,7 +82,6 @@ idep_agx_builder_h = declare_dependency(
 libasahi_compiler = static_library(
   'asahi_compiler',
   [libasahi_agx_files, agx_opcodes_c, agx_nir_algebraic_c],
-  include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_mapi],
   dependencies: [idep_nir, idep_agx_opcodes_h, idep_agx_builder_h, idep_agx_pack],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
@@ -102,7 +101,6 @@ if with_tests
       ),
       c_args : [c_msvc_compat_args, no_override_init_args],
       gnu_symbol_visibility : 'hidden',
-      include_directories : [inc_include, inc_src, inc_mesa],
       dependencies: [idep_gtest, idep_nir, idep_agx_opcodes_h, idep_agx_builder_h],
       link_with : [libasahi_compiler],
     ),
diff --git a/src/asahi/drm-shim/meson.build b/src/asahi/drm-shim/meson.build
index 2b49e3c..ec0781d 100644
--- a/src/asahi/drm-shim/meson.build
+++ b/src/asahi/drm-shim/meson.build
@@ -4,7 +4,7 @@
 libasahi_noop_drm_shim = shared_library(
   'asahi_noop_drm_shim',
   'asahi_noop.c',
-  include_directories: [inc_include, inc_src],
+  include_directories: inc_src,
   dependencies: dep_drm_shim,
   gnu_symbol_visibility : 'hidden',
   install : true,
diff --git a/src/asahi/layout/meson.build b/src/asahi/layout/meson.build
index a2cbe34..05b0363 100644
--- a/src/asahi/layout/meson.build
+++ b/src/asahi/layout/meson.build
@@ -9,7 +9,7 @@ libasahi_layout_files = files(
 libasahi_layout = static_library(
   'asahi_layout',
   [libasahi_layout_files],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi],
+  include_directories : [inc_include, inc_src, inc_gallium],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   build_by_default : false,
@@ -26,7 +26,6 @@ if with_tests
       ),
       c_args : [c_msvc_compat_args, no_override_init_args],
       gnu_symbol_visibility : 'hidden',
-      include_directories : [inc_include, inc_src],
       dependencies: [idep_gtest, idep_mesautil],
       link_with : [libasahi_layout],
     ),
diff --git a/src/asahi/lib/meson.build b/src/asahi/lib/meson.build
index 288cba2..7a91d3a1 100644
--- a/src/asahi/lib/meson.build
+++ b/src/asahi/lib/meson.build
@@ -41,7 +41,6 @@ idep_agx_pack = declare_dependency(
 libasahi_decode = static_library(
   'asahi_decode',
   [libasahi_decode_files, agx_pack],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi],
   dependencies : [dep_valgrind, idep_mesautil],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
@@ -51,7 +50,6 @@ libasahi_decode = static_library(
 libasahi_decode_shared = shared_library(
   'asahi_decode',
   [libasahi_decode_files, agx_pack],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi],
   dependencies : [dep_valgrind, idep_mesautil],
   c_args : [no_override_init_args],
   build_by_default : with_tools.contains('asahi'),
@@ -60,7 +58,7 @@ libasahi_decode_shared = shared_library(
 libasahi_lib = static_library(
   'asahi_lib',
   [libasahi_lib_files, agx_pack],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi],
+  include_directories : inc_asahi,
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   link_with: [libasahi_decode],
@@ -79,7 +77,6 @@ if with_tests
       ),
       c_args : [c_msvc_compat_args, no_override_init_args],
       gnu_symbol_visibility : 'hidden',
-      include_directories : [inc_include, inc_src, inc_mesa],
       dependencies: [idep_gtest, idep_agx_pack, idep_mesautil],
       link_with : [libasahi_lib],
     ),
@@ -92,7 +89,7 @@ if dep_iokit.found()
   libasahi_wrap = shared_library(
     'wrap',
     'wrap.c',
-    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi],
+    include_directories : [inc_src, inc_asahi],
     dependencies : [idep_mesautil, dep_iokit],
     c_args : [no_override_init_args, '-Wno-missing-prototypes'],
     gnu_symbol_visibility : 'hidden',
-- 
2.7.4