meson: inline `inc_common`

[mesa.git] / src / mesa / drivers / dri / i965 / meson.build

diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 9adda06183dd4f6466046364a0812ebcfd5b2cd8..cf94548800b3b6cdd98f65a3aefd750eb20a4166 100644 (file)
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -42,6 +42,7 @@ files_i965 = files(
   'brw_ff_gs_emit.c',
   'brw_ff_gs.h',
   'brw_formatquery.c',
+  'brw_generate_mipmap.c',
   'brw_gs.c',
   'brw_gs.h',
   'brw_gs_surface_state.c',
@@ -53,7 +54,6 @@ files_i965 = files(
   'brw_nir_uniforms.cpp',
   'brw_object_purgeable.c',
   'brw_pipe_control.c',
-  'brw_performance_query.h',
   'brw_performance_query.c',
   'brw_program.c',
   'brw_program.h',
@@ -84,14 +84,12 @@ files_i965 = files(
   'gen4_blorp_exec.h',
   'gen6_clip_state.c',
   'gen6_constant_state.c',
-  'gen6_depth_state.c',
   'gen6_multisample_state.c',
   'gen6_queryobj.c',
   'gen6_sampler_state.c',
   'gen6_sol.c',
   'gen6_urb.c',
   'gen7_l3_state.c',
-  'gen7_misc_state.c',
   'gen7_sol_state.c',
   'gen7_urb.c',
   'gen8_depth_state.c',
@@ -128,56 +126,40 @@ files_i965 = files(
   'intel_tex_image.c',
   'intel_tex_obj.h',
   'intel_tex_validate.c',
-  'intel_tiled_memcpy.c',
-  'intel_tiled_memcpy.h',
   'intel_upload.c',
   'libdrm_macros.h',
 )
 
 i965_gen_libs = []
-foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100']
+foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110']
   i965_gen_libs += static_library(
-    'libi965_gen@0@'.format(v),
-    ['genX_blorp_exec.c', 'genX_state_upload.c', gen_xml_pack],
-    include_directories : [inc_common, inc_intel, inc_dri_common],
+    'i965_gen@0@'.format(v),
+    ['genX_blorp_exec.c', 'genX_boilerplate.h', 'genX_pipe_control.c',
+     'genX_state_upload.c', gen_xml_pack],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common],
     c_args : [
-      c_vis_args, no_override_init_args, '-msse2',
+      c_vis_args, no_override_init_args, c_sse2_args,
       '-DGEN_VERSIONx10=@0@'.format(v),
     ],
     dependencies : [dep_libdrm, idep_nir_headers],
   )
 endforeach
 
-oa_generator = generator(
-  prog_python2,
-  arguments : [
-    '@CURRENT_SOURCE_DIR@/brw_oa.py', '@INPUT@', '--chipset', '@EXTRA_ARGS@',
-    '--code', '@OUTPUT0@', '--header', '@OUTPUT1@',
-  ],
-  output : ['@BASENAME@.c', '@BASENAME@.h'],
-)
-
-i965_oa_sources = []
-foreach hw : ['hsw', 'bdw', 'chv', 'sklgt2', 'sklgt3', 'sklgt4', 'bxt',
-              'kblgt2', 'kblgt3', 'glk', 'cflgt2', 'cflgt3']
-  _xml = 'brw_oa_@0@.xml'.format(hw)
-  i965_oa_sources += oa_generator.process(_xml, extra_args : hw)
-endforeach
 
 libi965 = static_library(
   'i965',
-  [files_i965, i965_oa_sources, ir_expression_operation_h,
-   xmlpool_options_h],
+  [files_i965, ir_expression_operation_h],
   include_directories : [
-    inc_common, inc_intel, inc_dri_common, inc_util, inc_drm_uapi,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common,
   ],
-  c_args : [c_vis_args, no_override_init_args, '-msse2'],
-  cpp_args : [cpp_vis_args, '-msse2'],
+  c_args : [c_vis_args, no_override_init_args, c_sse2_args],
+  cpp_args : [cpp_vis_args, c_sse2_args],
   link_with : [
-    i965_gen_libs, libintel_common, libisl, libintel_compiler, libblorp,
+    i965_gen_libs, libintel_dev, libisl, libintel_compiler, libblorp,
+    libintel_perf
+  ],
+  dependencies : [
+    dep_libdrm, dep_valgrind, idep_libintel_common, idep_nir_headers, idep_genxml,
+    idep_xmlconfig,
   ],
-  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
 )
-
-dri_drivers += libi965
-dri_link += 'i965_dri.so'