Import Mesa 21.1.5

1 files changed, 9 insertions, 20 deletions

diff --git a/lib/mesa/src/gallium/drivers/panfrost/meson.build b/lib/mesa/src/gallium/drivers/panfrost/meson.build
index 87eb74b53..5afea1ad7 100644
--- a/lib/mesa/src/gallium/drivers/panfrost/meson.build
+++ b/lib/mesa/src/gallium/drivers/panfrost/meson.build
@@ -25,32 +25,18 @@ files_panfrost = files(
   'pan_screen.h',
   'pan_resource.c',
   'pan_resource.h',
-
-  '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_allocate.c',
   'pan_assemble.c',
-  'pan_format.c',
-  'pan_blending.c',
-  'pan_blend_shaders.c',
   'pan_blend_cso.c',
+  'pan_cmdstream.c',
   'pan_compute.c',
-  'pan_fragment.c',
-  'pan_attributes.c',
-  'pan_scoreboard.c',
-  'pan_sfbd.c',
-  'pan_mfbd.c',
-  'pan_varyings.c',
 )
 
 panfrost_includes = [
-  inc_common,
+  inc_mapi,
+  inc_mesa,
   inc_gallium,
   inc_gallium_aux,
   inc_include,
@@ -69,13 +55,16 @@ libpanfrost = static_library(
   dependencies: [
     dep_thread,
     dep_libdrm,
-    idep_nir
+    idep_mesautil,
+    idep_nir,
+    idep_midgard_pack
   ],
   include_directories : panfrost_includes,
-  c_args : [c_vis_args, c_msvc_compat_args, compile_args_panfrost],
+  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, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode, libpanfrost_encoder],
+  link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode, libpanfrost_lib],
 )