etnaviv: decouple drm from gallium

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24465>

diff --git a/src/etnaviv/drm-shim/meson.build b/src/etnaviv/drm-shim/meson.build
index 29457f9..2c13e02 100644 (file)
--- a/src/etnaviv/drm-shim/meson.build
+++ b/src/etnaviv/drm-shim/meson.build
@@ -23,7 +23,7 @@
 libetnaviv_noop_drm_shim = shared_library(
   'etnaviv_noop_drm_shim',
   'etnaviv_noop.c',
-  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories: [inc_include, inc_src],
   dependencies: [dep_drm_shim, idep_mesautil],
   gnu_symbol_visibility : 'hidden',
   install : true,

diff --git a/src/etnaviv/drm/meson.build b/src/etnaviv/drm/meson.build
index c5f6e09..697ca1d 100644 (file)
--- a/src/etnaviv/drm/meson.build
+++ b/src/etnaviv/drm/meson.build
@@ -37,10 +37,6 @@ libetnaviv_drm = static_library(
     inc_etnaviv,
     inc_include,
     inc_src,
-    inc_mapi,
-    inc_mesa,
-    inc_gallium,
-    inc_gallium_aux,
   ],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',

diff --git a/src/etnaviv/drm/tests/meson.build b/src/etnaviv/drm/tests/meson.build
index c5a3c77..61c16b0 100644 (file)
--- a/src/etnaviv/drm/tests/meson.build
+++ b/src/etnaviv/drm/tests/meson.build
@@ -25,10 +25,6 @@ etnaviv_cmd_stream_test = executable(
     inc_etnaviv,
     inc_include,
     inc_src,
-    inc_mapi,
-    inc_mesa,
-    inc_gallium,
-    inc_gallium_aux,
   ],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
@@ -48,10 +44,6 @@ etnaviv_bo_cache_test = executable(
     inc_etnaviv,
     inc_include,
     inc_src,
-    inc_mapi,
-    inc_mesa,
-    inc_gallium,
-    inc_gallium_aux,
   ],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',