X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ffreedreno%2Fmeson.build;h=a5c0935e07ecc0973489c543aaf61b8977896c85;hb=9ce4db6231462998f9426c74681a464bda928842;hp=1e3a3037014bf59ceaa787bb7d1df4a31490ff48;hpb=fc4f6b2f12bd6b7b2b2b727f84563bf1fec308b8;p=mesa.git

diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index 1e3a3037014..a5c0935e07e 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -34,7 +34,8 @@ files_libfreedreno = files(
   'freedreno_fence.h',
   'freedreno_gmem.c',
   'freedreno_gmem.h',
-  'freedreno_perfcntr.h',
+  'freedreno_log.c',
+  'freedreno_log.h',
   'freedreno_program.c',
   'freedreno_program.h',
   'freedreno_query.c',
@@ -70,6 +71,8 @@ files_libfreedreno = files(
   'a2xx/fd2_gmem.h',
   'a2xx/fd2_program.c',
   'a2xx/fd2_program.h',
+  'a2xx/fd2_query.c',
+  'a2xx/fd2_query.h',
   'a2xx/fd2_rasterizer.c',
   'a2xx/fd2_rasterizer.h',
   'a2xx/fd2_resource.c',
@@ -88,7 +91,6 @@ files_libfreedreno = files(
   'a2xx/ir2_assemble.c',
   'a2xx/ir2_cp.c',
   'a2xx/ir2_nir.c',
-  'a2xx/ir2_nir_lower_scalar.c',
   'a2xx/ir2_private.h',
   'a2xx/ir2_ra.c',
   'a3xx/fd3_blend.c',
@@ -109,6 +111,8 @@ files_libfreedreno = files(
   'a3xx/fd3_query.h',
   'a3xx/fd3_rasterizer.c',
   'a3xx/fd3_rasterizer.h',
+  'a3xx/fd3_resource.c',
+  'a3xx/fd3_resource.h',
   'a3xx/fd3_screen.c',
   'a3xx/fd3_screen.h',
   'a3xx/fd3_texture.c',
@@ -157,7 +161,6 @@ files_libfreedreno = files(
   'a5xx/fd5_gmem.h',
   'a5xx/fd5_image.c',
   'a5xx/fd5_image.h',
-  'a5xx/fd5_perfcntr.c',
   'a5xx/fd5_program.c',
   'a5xx/fd5_program.h',
   'a5xx/fd5_query.c',
@@ -176,6 +179,8 @@ files_libfreedreno = files(
   'a6xx/fd6_blend.h',
   'a6xx/fd6_blitter.c',
   'a6xx/fd6_blitter.h',
+  'a6xx/fd6_compute.c',
+  'a6xx/fd6_compute.h',
   'a6xx/fd6_context.c',
   'a6xx/fd6_context.h',
   'a6xx/fd6_draw.c',
@@ -209,11 +214,12 @@ files_libfreedreno = files(
 )
 
 freedreno_includes = [
+  inc_mesa, inc_mapi,
   inc_src, inc_include, inc_gallium, inc_gallium_aux,
   inc_freedreno, include_directories('ir3'),
 ]
 
-freedreno_c_args = []
+freedreno_c_args = [ c_vis_args, no_override_init_args ]
 if cc.has_argument('-Wpacked-bitfield-compat')
   freedreno_c_args += '-Wno-packed-bitfield-compat'
 endif
@@ -225,7 +231,7 @@ endif
 
 libfreedreno = static_library(
   'freedreno',
-  [files_libfreedreno],
+  [files_libfreedreno, freedreno_xml_header_files],
   include_directories : freedreno_includes,
   c_args : [freedreno_c_args, c_vis_args],
   cpp_args : [freedreno_cpp_args, cpp_vis_args],
@@ -239,6 +245,8 @@ driver_freedreno = declare_dependency(
     libfreedreno,
     libfreedreno_drm,
     libfreedreno_ir3,
+    libfreedreno_layout,
+    libfreedreno_perfcntrs
   ],
   dependencies : idep_nir,
 )
@@ -248,16 +256,16 @@ ir3_compiler = executable(
   'ir3/ir3_cmdline.c',
   include_directories : freedreno_includes,
   dependencies : [
-    dep_thread,
     idep_nir,
+    idep_mesautil,
   ],
   link_with : [
     libfreedreno,
     libfreedreno_drm,
     libfreedreno_ir3,
+    libfreedreno_layout,
     libgallium,
     libglsl_standalone,
-    libmesa_util,
   ],
   build_by_default : with_tools.contains('freedreno'),
   install : with_tools.contains('freedreno'),