meson: build gallium nine state_tracker

v2: - set d3d_drivers_path instead of dri_drivers_path
    - Fix nine guard to check for all relavent gallium drivers
    - Link with libswdri and libswkmsdri when necessary
    - Fix pkg-config generation
    - Add missing comma

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

include/meson.build

@@ -20,6 +20,7 @@
 
 inc_drm_uapi = include_directories('drm-uapi')
 inc_vulkan = include_directories('vulkan')
+inc_d3d9 = include_directories('D3D9')
 
 if with_gles1
   install_headers(
@@ -70,3 +71,10 @@ endif
 if with_dri
   install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal')
 endif
+
+if with_gallium_st_nine
+  install_headers(
+    'd3dadapter/d3dadapter9.h', 'd3dadapter/drm.h', 'd3dadapter/present.h',
+    subdir : 'd3dadapter',
+  )
+endif

meson.build

@@ -560,6 +560,24 @@ else
   with_gallium_xa = false
 endif
 
+d3d_drivers_path = get_option('d3d-drivers-path')
+if d3d_drivers_path == ''
+  d3d_drivers_path = join_paths(get_option('libdir'), 'd3d')
+endif
+
+with_gallium_st_nine =  get_option('gallium-nine')
+if with_gallium_st_nine
+  if not with_gallium_softpipe
+    error('The nine state tracker requires gallium softpipe/llvmpipe.')
+  elif not (with_gallium_radeonsi or with_gallium_nouveau or with_gallium_r600
+            or with_gallium_r300 or with_gallium_svga or with_gallium_i915)
+    error('The nine state tracker requires at least on non-swrast gallium driver.')
+  endif
+  if not with_dri3
+    error('Using nine with wine requires dri3')
+  endif
+endif
+
 gl_pkgconfig_c_flags = []
 if with_platform_x11
   if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
@@ -1131,9 +1149,6 @@ else
   dep_lmsensors = []
 endif
 
-
-# TODO: nine
-
 # TODO: clover
 
 # TODO: gallium tests

meson_options.txt

@@ -114,6 +114,18 @@ option(
   choices : ['auto', 'true', 'false'],
   description : 'enable gallium xa state tracker.',
 )
+option(
+  'gallium-nine',
+  type : 'boolean',
+  value : false,
+  description : 'build gallium "nine" Direct3D 9.x state tracker.',
+)
+option(
+  'd3d-drivers-path',
+  type : 'string',
+  value : '',
+  description : 'Location of D3D drivers. Default: $libdir/d3d',
+)
 option(
   'vulkan-drivers',
   type : 'string',

src/gallium/meson.build

@@ -134,6 +134,9 @@ endif
 if with_gallium_xa
   subdir('state_trackers/xa')
 endif
+if with_gallium_st_nine
+  subdir('state_trackers/nine')
+endif
 # TODO: SWR
 # TODO: clover
 if with_dri
@@ -164,5 +167,7 @@ endif
 if with_gallium_xa
   subdir('targets/xa')
 endif
-# TODO: nine
+if with_gallium_st_nine
+  subdir('targets/d3dadapter9')
+endif
 # TODO: tests

src/gallium/state_trackers/nine/meson.build

@@ -0,0 +1,69 @@
+# Copyright © 2017 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+nine_st_files = files(
+  'adapter9.c',
+  'authenticatedchannel9.c',
+  'basetexture9.c',
+  'buffer9.c',
+  'cryptosession9.c',
+  'cubetexture9.c',
+  'device9.c',
+  'device9ex.c',
+  'device9video.c',
+  'guid.c',
+  'indexbuffer9.c',
+  'iunknown.c',
+  'nine_buffer_upload.c',
+  'nine_debug.c',
+  'nine_dump.c',
+  'nineexoverlayextension.c',
+  'nine_ff.c',
+  'nine_helpers.c',
+  'nine_lock.c',
+  'nine_pipe.c',
+  'nine_quirk.c',
+  'nine_queue.c',
+  'nine_shader.c',
+  'nine_state.c',
+  'pixelshader9.c',
+  'query9.c',
+  'resource9.c',
+  'stateblock9.c',
+  'surface9.c',
+  'swapchain9.c',
+  'swapchain9ex.c',
+  'texture9.c',
+  'threadpool.c',
+  'vertexbuffer9.c',
+  'vertexdeclaration9.c',
+  'vertexshader9.c',
+  'volume9.c',
+  'volumetexture9.c',
+)
+
+libnine_st = static_library(
+  'nine_st',
+  nine_st_files,
+  c_args : c_vis_args,
+  include_directories : [
+    inc_d3d9, inc_gallium, inc_include, inc_src, inc_gallium_aux,
+  ],
+)

src/gallium/targets/d3dadapter9/meson.build

@@ -0,0 +1,81 @@
+# Copyright © 2017 Dylan Baker
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# TODO: support non-static targets
+# Static targets are always enabled in autotools (unless you modify
+# configure.ac)
+
+nine_version = ['1', '0', '0']
+
+gallium_nine_c_args = [
+  '-DGALLIUM_DDEBUG',
+  '-DGALLIUM_RBUG',
+  '-DGALLIUME_TRACE',
+]
+gallium_nine_ld_args = []
+gallium_nine_link_depends = []
+gallium_nine_link_with = []
+
+if with_ld_version_script
+  gallium_nine_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'd3dadapter9.sym')]
+  gallium_nine_link_depends += files('d3dadapter9.sym')
+endif
+
+if with_dri
+  gallium_nine_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+  gallium_nine_link_with += libswkmsdri
+endif
+
+libgallium_nine = shared_library(
+  'd3dadapter9',
+  files('description.c', 'getproc.c', 'drm.c'),
+  include_directories : [
+    inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
+    inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
+    inc_gallium_drivers, inc_d3d9,
+    include_directories('../../state_trackers/nine'),
+  ],
+  c_args : [c_vis_args, gallium_nine_c_args],
+  cpp_args : [cpp_vis_args],
+  link_args : [ld_args_gc_sections, gallium_nine_ld_args],
+  link_depends : gallium_nine_link_depends,
+  link_with : [
+    libgalliumvl_stub, libgallium, libnine_st, libmesa_util, libddebug,
+    librbug, libtrace, libpipe_loader_static, libws_null, libwsw,
+    gallium_nine_link_with,
+  ],
+  dependencies : [
+    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors,
+    driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
+    driver_i915, driver_svga,
+  ],
+  version : '.'.join(nine_version),
+  install : true,
+  install_dir : d3d_drivers_path,
+)
+
+pkg.generate(
+  name : 'd3d',
+  description : 'Native D3D driver modules',
+  version : '.'.join(nine_version),
+  requires_private : 'libdrm >= 2.4.75',
+)