X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fintel%2Fvulkan%2Fmeson.build;h=7fa43a6ad791f1a19b10a6f8243354e133bdc7f1;hb=e02959f442ed6546fb632a153ffc32848968038f;hp=ff24e304ef50e3d455b66ede01a789cdc9db55b3;hpb=f3e91e78a3377594f0ef40ba50abed04dc590623;p=mesa.git

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index ff24e304ef5..7fa43a6ad79 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-2019 Intel Corporation
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,43 +18,67 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+anv_extensions_py = files('anv_extensions.py')
+
 anv_entrypoints = custom_target(
   'anv_entrypoints.[ch]',
-  input : ['anv_entrypoints_gen.py', vk_api_xml, vk_android_native_buffer_xml],
+  input : ['anv_entrypoints_gen.py', vk_api_xml],
   output : ['anv_entrypoints.h', 'anv_entrypoints.c'],
-  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
-             '--xml', '@INPUT2@', '--outdir', meson.current_build_dir()],
-  depend_files : files('anv_extensions.py'),
+  command : [
+    prog_python, '@INPUT0@', '--xml', '@INPUT1@',
+    '--outdir', meson.current_build_dir(),
+  ],
+  depend_files : anv_extensions_py,
 )
 
 anv_extensions_c = custom_target(
   'anv_extensions.c',
-  input : ['anv_extensions.py', vk_api_xml, vk_android_native_buffer_xml],
+  input : ['anv_extensions_gen.py', vk_api_xml],
   output : 'anv_extensions.c',
-  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
-             '--xml', '@INPUT2@', '--out', '@OUTPUT@'],
+  command : [
+    prog_python, '@INPUT0@', '--xml', '@INPUT1@',
+    '--out-c', '@OUTPUT@',
+  ],
+  depend_files : anv_extensions_py,
+)
+
+anv_extensions_h = custom_target(
+  'anv_extensions.h',
+  input : ['anv_extensions_gen.py', vk_api_xml],
+  output : 'anv_extensions.h',
+  command : [
+    prog_python, '@INPUT0@', '--xml', '@INPUT1@',
+    '--out-h', '@OUTPUT@',
+  ],
+  depend_files : anv_extensions_py,
 )
 
 intel_icd = custom_target(
   'intel_icd',
   input : 'anv_icd.py',
-  output : 'intel_icd.@0@.json'.format(target_machine.cpu()),
-  command : [prog_python2, '@INPUT@',
-             '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
-             '--out', '@OUTPUT@'],
-  depend_files : files('anv_extensions.py'),
+  output : 'intel_icd.@0@.json'.format(host_machine.cpu()),
+  command : [
+    prog_python, '@INPUT@',
+    '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
+    '--out', '@OUTPUT@',
+  ],
+  depend_files : anv_extensions_py,
   build_by_default : true,
   install_dir : with_vulkan_icd_dir,
   install : true,
 )
 
-# TODO: workaround for anv_entrypoints combining the .h and .c files in it's
-# output. See issue #2346
-block_entrypoints = custom_target(
-  'block_entrypoints',
-  command : [prog_touch, '@OUTPUT@'],
-  output : 'null',
-  depends : anv_entrypoints,
+dev_icd = custom_target(
+  'dev_icd',
+  input : 'anv_icd.py',
+  output : 'dev_icd.@0@.json'.format(host_machine.cpu()),
+  command : [
+    prog_python, '@INPUT@', '--lib-path', meson.current_build_dir(),
+    '--out', '@OUTPUT@'
+  ],
+  depend_files : files('anv_extensions.py'),
+  build_by_default : true,
+  install : false,
 )
 
 libanv_gen_libs = []
@@ -68,27 +92,30 @@ anv_gen_files = files(
 )
 foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
              ['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
-             ['100', ['gen8_cmd_buffer.c']]]
+             ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']]]
   _gen = g[0]
-  _files = g[1]
-  _lib = static_library(
-    'libanv_gen@0@'.format(_gen),
-    [anv_gen_files, _files, block_entrypoints, nir_opcodes_h],
-    include_directories : [inc_common, inc_compiler, inc_drm_uapi, inc_intel,
-                           inc_vulkan_util, inc_vulkan_wsi],
-    c_args : [c_vis_args, no_override_init_args, '-msse2',
-              '-DGEN_VERSIONx10=@0@'.format(_gen)],
-    dependencies : [dep_libdrm, dep_valgrind],
+  libanv_gen_libs += static_library(
+    'anv_gen@0@'.format(_gen),
+    [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
+    include_directories : [
+      inc_common, inc_compiler, inc_include, inc_intel, inc_vulkan_util,
+      inc_vulkan_wsi,
+    ],
+    c_args : [
+      c_vis_args, no_override_init_args, c_sse2_args,
+      '-DGEN_VERSIONx10=@0@'.format(_gen),
+    ],
+    dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
   )
-  libanv_gen_libs += _lib
 endforeach
 
 libanv_files = files(
   'anv_allocator.c',
+  'anv_android_stubs.c',
+  'anv_android.h',
   'anv_batch_chain.c',
   'anv_blorp.c',
   'anv_cmd_buffer.c',
-  'anv_debug_report.c',
   'anv_descriptor_set.c',
   'anv_device.c',
   'anv_dump.c',
@@ -97,6 +124,7 @@ libanv_files = files(
   'anv_image.c',
   'anv_intel.c',
   'anv_nir.h',
+  'anv_nir_add_base_work_group_id.c',
   'anv_nir_apply_pipeline_layout.c',
   'anv_nir_lower_input_attachments.c',
   'anv_nir_lower_multiview.c',
@@ -112,8 +140,16 @@ libanv_files = files(
   'vk_format_info.h',
 )
 
-anv_deps = []
-anv_flags = []
+anv_deps = [
+  dep_libdrm,
+  dep_valgrind,
+  idep_nir_headers,
+]
+anv_flags = [
+  c_vis_args,
+  no_override_init_args,
+  c_sse2_args,
+]
 
 if with_platform_x11
   anv_deps += dep_xcb_dri3
@@ -130,25 +166,46 @@ if with_platform_wayland
   libanv_files += files('anv_wsi_wayland.c')
 endif
 
+if with_platform_drm
+  anv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
+  libanv_files += files('anv_wsi_display.c')
+endif
+
+if with_xlib_lease
+  anv_deps += [dep_xcb_xrandr, dep_xlib_xrandr]
+  anv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
+endif
+
 libanv_common = static_library(
   'anv_common',
-  [libanv_files, anv_entrypoints, anv_extensions_c, nir_opcodes_h],
-  include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
-                         inc_vulkan_util, inc_vulkan_wsi],
-  c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
-  dependencies : [dep_valgrind, anv_deps, dep_libdrm],
+  [
+    libanv_files, anv_entrypoints, anv_extensions_c, anv_extensions_h, sha1_h,
+    gen_xml_pack,
+  ],
+  include_directories : [
+    inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
+    inc_vulkan_wsi,
+  ],
+  c_args : anv_flags,
+  dependencies : anv_deps,
 )
 
 libvulkan_intel = shared_library(
   'vulkan_intel',
-  [files('anv_gem.c'), block_entrypoints],
-  include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
-                         inc_vulkan_util, inc_vulkan_wsi],
+  [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h],
+  include_directories : [
+    inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
+    inc_vulkan_wsi,
+  ],
   link_whole : [libanv_common, libanv_gen_libs],
-  link_with : [libintel_compiler, libintel_common, libisl, libblorp,
-               libvulkan_util, libvulkan_wsi, libnir, libmesa_util],
-  dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind],
-  c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
+  link_with : [
+    libintel_compiler, libintel_common, libintel_dev, libisl, libblorp,
+    libvulkan_util, libvulkan_wsi, libmesa_util,
+  ],
+  dependencies : [
+    dep_thread, dep_dl, dep_m, anv_deps, idep_nir,
+  ],
+  c_args : anv_flags,
   link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
   install : true,
 )
@@ -156,28 +213,38 @@ libvulkan_intel = shared_library(
 if with_tests
   libvulkan_intel_test = static_library(
     'vulkan_intel_test',
-    [files('anv_gem_stubs.c'), block_entrypoints],
-    include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
-                           inc_vulkan_util, inc_vulkan_wsi],
+    [files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h],
+    include_directories : [
+      inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
+      inc_vulkan_wsi,
+    ],
     link_whole : libanv_common,
-    link_with : [libanv_gen_libs, libintel_compiler, libintel_common,
-                 libisl, libblorp, libvulkan_util, libvulkan_wsi,
-                 libnir, libmesa_util],
-    dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps,
-                    dep_valgrind],
-    c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
+    link_with : [
+      libanv_gen_libs, libintel_compiler, libintel_common, libintel_dev,
+      libisl, libblorp, libvulkan_util, libvulkan_wsi, libmesa_util,
+    ],
+    dependencies : [
+      dep_thread, dep_dl, dep_m, anv_deps, idep_nir,
+    ],
+    c_args : anv_flags,
   )
 
   foreach t : ['block_pool_no_free', 'state_pool_no_free',
-               'state_pool_free_list_only', 'state_pool']
-    _exe = executable(
-      t,
-      ['tests/@0@.c'.format(t), dummy_cpp, block_entrypoints],
-      link_with : libvulkan_intel_test,
-      dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
-      include_directories : [inc_common, inc_intel, inc_compiler,
-                             inc_vulkan_util, inc_vulkan_wsi],
+               'state_pool_free_list_only', 'state_pool',
+               'state_pool_padding']
+    test(
+      'anv_@0@'.format(t),
+      executable(
+        t,
+        ['tests/@0@.c'.format(t), anv_entrypoints[0], anv_extensions_h],
+        c_args : [ c_sse2_args ],
+        link_with : libvulkan_intel_test,
+        dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
+        include_directories : [
+          inc_common, inc_intel, inc_compiler, inc_vulkan_util, inc_vulkan_wsi,
+        ],
+      ),
+      suite : ['intel'],
     )
-    test('anv_@0@'.format(t), _exe)
   endforeach
 endif