panfrost: Avoid accessing pan_pool fields directly

[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 9c36daeb0f2e5bdecf347b61ff6241c248940c64..7222d40c3c30d3654e4b1f3206b74f142e27b06d 100644 (file)
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -26,30 +26,31 @@ files_panfrost = files(
   'pan_resource.c',
   'pan_resource.h',
 
-  'midgard/midgard_compile.c',
-  'midgard/cppwrap.cpp',
-  'midgard/disassemble.c',
+  'nir/nir_lower_blend.c',
 
   'pan_context.c',
-  'pan_drm.c',
-  'pan_allocate.c',
+  'pan_blit.c',
+  'pan_job.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_cmdstream.c',
+  'pan_compute.c',
+  'pan_fragment.c',
+  'pan_sfbd.c',
+  'pan_mfbd.c',
+  'pan_partial_update.c',
 )
 
-inc_panfrost = [
-  inc_common,
+panfrost_includes = [
+  inc_mapi,
+  inc_mesa,
   inc_gallium,
   inc_gallium_aux,
   inc_include,
   inc_src,
-  include_directories('include'),
-  include_directories('midgard'),
+  inc_panfrost,
 ]
 
 compile_args_panfrost = [
@@ -57,87 +58,21 @@ 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
-  subdir('nondrm/include')
-  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',
-  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
+    idep_nir,
+    idep_midgard_pack
   ],
-  include_directories : inc_panfrost,
-  c_args : [c_vis_args, c_msvc_compat_args, compile_args_panfrost],
+  include_directories : panfrost_includes,
+  c_args : [c_msvc_compat_args, compile_args_panfrost],
+  gnu_symbol_visibility : 'hidden',
 )
 
 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',
-)
-
-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
-)
-
-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_lib],
 )