X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fmeson.build;h=39f1fd8e6b0986784ae8c9c0b3196b8ebd076d6c;hb=6434f5c4942969dc60a8680c2ba00b97bf253009;hp=9568247f36d71ae290cd6150ba35724efb1ac90c;hpb=10cc2518426eccdd2d232af9e2366be013e31af8;p=mesa.git

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 9568247f36d..39f1fd8e6b0 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -27,11 +27,28 @@ files_panfrost = files(
   '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',
+
   'pan_context.c',
-  'pan_trace.c',
+  'pan_afbc.c',
+  'pan_blit.c',
+  'pan_job.c',
   'pan_drm.c',
   'pan_allocate.c',
   'pan_assemble.c',
@@ -39,8 +56,11 @@ files_panfrost = files(
   'pan_swizzle.c',
   'pan_blending.c',
   'pan_blend_shaders.c',
-  'pan_wallpaper.c',
   'pan_pretty_print.c',
+  'pan_fragment.c',
+  'pan_sfbd.c',
+  'pan_mfbd.c',
+  'pan_tiler.c',
 )
 
 inc_panfrost = [
@@ -51,6 +71,7 @@ inc_panfrost = [
   inc_src,
   include_directories('include'),
   include_directories('midgard'),
+  include_directories('bifrost'),
 ]
 
 compile_args_panfrost = [
@@ -58,16 +79,6 @@ compile_args_panfrost = [
   '-Wno-pointer-arith'
 ]
 
-overlay = join_paths(meson.source_root(), meson.current_source_dir(), 'nondrm/pan_nondrm.c')
-nondrm_overlay_check = run_command('ls', overlay)
-has_nondrm_overlay = nondrm_overlay_check.returncode() == 0
-
-if has_nondrm_overlay
-  files_panfrost += files('nondrm/pan_nondrm.c')
-  inc_panfrost += include_directories('nondrm/include')
-  compile_args_panfrost += '-DPAN_NONDRM_OVERLAY'
-endif
-
 midgard_nir_algebraic_c = custom_target(
   'midgard_nir_algebraic.c',
   input : 'midgard/midgard_nir_algebraic.py',
@@ -97,17 +108,22 @@ driver_panfrost = declare_dependency(
   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,
+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
@@ -122,11 +138,14 @@ midgard_compiler = executable(
 
 files_pandecode = files(
   'pandecode/cmdline.c',
+  'pandecode/common.c',
   'pandecode/decode.c',
 
   'pan_pretty_print.c',
 
-  'midgard/disassemble.c'
+  'midgard/disassemble.c',
+  'midgard/midgard_ops.c',
+  'bifrost/disassemble.c',
 )
 
 pandecode = executable(