etnaviv: move liveness related stuff into own file

[mesa.git] / src / gallium / drivers / etnaviv / meson.build

diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index ac0231ea0e8a974ef909480ae886c88df5e8c4ee..737264f087a4eb8e4ce0670e078590403cde962c 100644 (file)
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -26,6 +26,7 @@ files_etnaviv = files(
   'hw/state_3d.xml.h',
   'hw/state_blt.xml.h',
   'hw/state.xml.h',
+  'hw/texdesc_3d.xml.h',
   'etnaviv_asm.c',
   'etnaviv_asm.h',
   'etnaviv_blend.c',
@@ -34,8 +35,11 @@ files_etnaviv = files(
   'etnaviv_blt.h',
   'etnaviv_clear_blit.c',
   'etnaviv_clear_blit.h',
-  'etnaviv_compiler.c',
   'etnaviv_compiler.h',
+  'etnaviv_compiler_nir.c',
+  'etnaviv_compiler_nir_emit.h',
+  'etnaviv_compiler_nir_liveness.c',
+  'etnaviv_compiler_tgsi.c',
   'etnaviv_context.c',
   'etnaviv_context.h',
   'etnaviv_debug.h',
@@ -43,15 +47,23 @@ files_etnaviv = files(
   'etnaviv_disasm.h',
   'etnaviv_emit.c',
   'etnaviv_emit.h',
+  'etnaviv_etc2.c',
+  'etnaviv_etc2.h',
   'etnaviv_fence.c',
   'etnaviv_fence.h',
   'etnaviv_format.c',
   'etnaviv_format.h',
   'etnaviv_internal.h',
+  'etnaviv_nir.c',
+  'etnaviv_nir.h',
+  'etnaviv_perfmon.c',
+  'etnaviv_perfmon.h',
   'etnaviv_query.c',
   'etnaviv_query.h',
-  'etnaviv_query_hw.c',
-  'etnaviv_query_hw.h',
+  'etnaviv_query_acc_occlusion.c',
+  'etnaviv_query_acc_perfmon.c',
+  'etnaviv_query_acc.c',
+  'etnaviv_query_acc.h',
   'etnaviv_query_sw.c',
   'etnaviv_query_sw.h',
   'etnaviv_rasterizer.c',
@@ -70,6 +82,8 @@ files_etnaviv = files(
   'etnaviv_surface.h',
   'etnaviv_texture.c',
   'etnaviv_texture.h',
+  'etnaviv_texture_desc.c',
+  'etnaviv_texture_desc.h',
   'etnaviv_texture_state.c',
   'etnaviv_texture_state.h',
   'etnaviv_tiling.c',
@@ -87,16 +101,28 @@ files_etnaviv = files(
 libetnaviv = static_library(
   'etnaviv',
   files_etnaviv,
-  c_args : [c_vis_args],
-  include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux],
-  dependencies : dep_libdrm_etnaviv,
+  gnu_symbol_visibility : 'hidden',
+  include_directories : [
+    inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
+  ],
+  link_with: libetnaviv_drm,
+  dependencies : [dep_libdrm, idep_nir_headers],
 )
 
 etnaviv_compiler = executable(
   'etnaviv_compiler',
   'etnaviv_compiler_cmdline.c',
-  include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux],
-  link_with : [libmesa_util, libgallium, libetnaviv],
-  dependencies : dep_libdrm_etnaviv,
-  build_by_default : false,
+  include_directories : [
+    inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
+  ],
+  link_with : [libgallium, libetnaviv, libetnaviv_drm],
+  build_by_default : with_tools.contains('etnaviv'),
+  install : with_tools.contains('etnaviv'),
+  dependencies : [idep_mesautil, dep_libdrm],
+)
+
+driver_etnaviv = declare_dependency(
+  compile_args : '-DGALLIUM_ETNAVIV',
+  link_with : [libetnaviv, libetnavivdrm],
+  dependencies : idep_nir,
 )