meson: inline `inc_common`

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

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 4298242f6b915877aac0d36c72450f0fe5800b41..92f043ea0a02dc2c49c92f77652d5e23343448fd 100644 (file)
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -26,53 +26,34 @@ files_panfrost = files(
   'pan_resource.c',
   'pan_resource.h',
 
-  'midgard/midgard_compile.c',
-  'midgard/mir.c',
-  'midgard/midgard_print.c',
-  'midgard/midgard_schedule.c',
-  'midgard/midgard_emit.c',
-  'midgard/midgard_ra.c',
-  'midgard/midgard_ra_pipeline.c',
-  'midgard/midgard_liveness.c',
-  'midgard/midgard_ops.c',
-
-  'midgard/nir_lower_blend.c',
-  'midgard/cppwrap.cpp',
-  'midgard/disassemble.c',
-
-  'bifrost/disassemble.c',
-
-  'pandecode/common.c',
-  'pandecode/decode.c',
+  'nir/nir_lower_blend.c',
+  'nir/nir_lower_framebuffer.c',
 
   'pan_context.c',
-  'pan_afbc.c',
+  'pan_bo.c',
   'pan_blit.c',
   'pan_job.c',
-  'pan_drm.c',
   'pan_allocate.c',
   'pan_assemble.c',
-  'pan_format.c',
   'pan_blending.c',
   'pan_blend_shaders.c',
-  'pan_pretty_print.c',
+  'pan_blend_cso.c',
+  'pan_cmdstream.c',
+  'pan_compute.c',
   'pan_fragment.c',
   'pan_scoreboard.c',
   'pan_sfbd.c',
   'pan_mfbd.c',
-  'pan_tiler.c',
 )
 
 panfrost_includes = [
-  inc_common,
+  inc_mapi,
+  inc_mesa,
   inc_gallium,
   inc_gallium_aux,
   inc_include,
   inc_src,
   inc_panfrost,
-  include_directories('include'),
-  include_directories('midgard'),
-  include_directories('bifrost'),
 ]
 
 compile_args_panfrost = [
@@ -80,21 +61,9 @@ compile_args_panfrost = [
   '-Wno-pointer-arith'
 ]
 
-midgard_nir_algebraic_c = custom_target(
-  'midgard_nir_algebraic.c',
-  input : 'midgard/midgard_nir_algebraic.py',
-  output : 'midgard_nir_algebraic.c',
-  command : [
-    prog_python, '@INPUT@',
-    '-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
-  ],
-  capture : true,
-  depend_files : nir_algebraic_py,
-)
-
 libpanfrost = static_library(
   'panfrost',
-  [files_panfrost, midgard_nir_algebraic_c],
+  files_panfrost,
   dependencies: [
     dep_thread,
     dep_libdrm,
@@ -106,58 +75,5 @@ libpanfrost = static_library(
 
 driver_panfrost = declare_dependency(
   compile_args : compile_args_panfrost,
-  link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared],
-)
-
-files_bifrost = files(
-  'bifrost/disassemble.c',
-  'bifrost/cmdline.c',
-)
-
-bifrost_compiler = executable(
-  'bifrost_compiler',
-  [files_bifrost],
-  include_directories : [
-    inc_common,
-    inc_src,
-    inc_include,
-    inc_gallium,
-    inc_gallium_aux,
-    include_directories('bifrost')
-    ],
-  dependencies : [
-    dep_thread,
-    idep_nir
-  ],
-  link_with : [
-    libgallium,
-    libglsl_standalone,
-    libmesa_util
-  ],
-  build_by_default : true
-)
-
-files_pandecode = files(
-  'pandecode/cmdline.c',
-  'pandecode/common.c',
-  'pandecode/decode.c',
-
-  'pan_pretty_print.c',
-
-  'midgard/disassemble.c',
-  'midgard/midgard_ops.c',
-  'bifrost/disassemble.c',
-)
-
-pandecode = executable(
-  'pandecode',
-  files_pandecode,
-  include_directories : panfrost_includes,
-  dependencies : [
-    dep_thread,
-  ],
-  link_with : [
-    libmesa_util
-  ],
-  build_by_default : true
+  link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode, libpanfrost_encoder],
 )