X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fmeson.build;h=87eb74b53053515de41675d6ce84ad1bce21fb4a;hb=d1925fec535bdadb28b9b25aa93be880fc79918f;hp=b3673d15bc172748d55d22f497d0256073755dad;hpb=2cd1aa3429e2d9b6d78579885031768a7978df61;p=mesa.git

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index b3673d15bc1..87eb74b5305 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -26,38 +26,36 @@ files_panfrost = files(
   'pan_resource.c',
   'pan_resource.h',
 
-  'midgard/midgard_compile.c',
-  'midgard/cppwrap.cpp',
-  'midgard/disassemble.c',
-
-  'bifrost/disassemble.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_trace.c',
-  'pan_drm.c',
   'pan_allocate.c',
   'pan_assemble.c',
   'pan_format.c',
-  'pan_swizzle.c',
   'pan_blending.c',
   'pan_blend_shaders.c',
-  'pan_wallpaper.c',
-  'pan_pretty_print.c',
+  'pan_blend_cso.c',
+  'pan_compute.c',
   'pan_fragment.c',
+  'pan_attributes.c',
+  'pan_scoreboard.c',
   'pan_sfbd.c',
-  'pan_mfbd.c'
+  'pan_mfbd.c',
+  'pan_varyings.c',
 )
 
-inc_panfrost = [
+panfrost_includes = [
   inc_common,
   inc_gallium,
   inc_gallium_aux,
   inc_include,
   inc_src,
-  include_directories('include'),
-  include_directories('midgard'),
-  include_directories('bifrost'),
+  inc_panfrost,
 ]
 
 compile_args_panfrost = [
@@ -65,104 +63,19 @@ 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,
     idep_nir
   ],
-  include_directories : inc_panfrost,
+  include_directories : panfrost_includes,
   c_args : [c_vis_args, c_msvc_compat_args, compile_args_panfrost],
 )
 
 driver_panfrost = declare_dependency(
   compile_args : compile_args_panfrost,
-  link_with : [libpanfrost, libpanfrostwinsys],
-)
-
-files_midgard = files(
-  'midgard/midgard_compile.c',
-  'midgard/cppwrap.cpp',
-  'midgard/disassemble.c',
-  'midgard/cmdline.c',
-)
-
-files_bifrost = files(
-  'bifrost/disassemble.c',
-  'bifrost/cmdline.c',
-)
-
-midgard_compiler = executable(
-  'midgard_compiler',
-  [files_midgard, midgard_nir_algebraic_c],
-  include_directories : inc_panfrost,
-  dependencies : [
-    dep_thread,
-    idep_nir
-  ],
-  link_with : [
-    libgallium,
-    libglsl_standalone,
-    libmesa_util
-  ],
-  build_by_default : true
-)
-
-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/decode.c',
-
-  'pan_pretty_print.c',
-
-  'midgard/disassemble.c'
-)
-
-pandecode = executable(
-  'pandecode',
-  files_pandecode,
-  include_directories : inc_panfrost,
-  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],
 )