[Mesa-dev] [PATCH v2 15/15] meson: build gallium nine state_tracker
Dylan Baker
dylan at pnwbakers.com
Wed Nov 29 19:15:36 UTC 2017
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 at intel.com>
---
include/meson.build | 8 ++
meson.build | 18 +++-
meson_options.txt | 12 +++
src/gallium/meson.build | 7 +-
.../gallium/state_trackers/nine}/meson.build | 95 +++++++++++-----------
src/gallium/targets/d3dadapter9/meson.build | 81 ++++++++++++++++++
6 files changed, 172 insertions(+), 49 deletions(-)
copy {include => src/gallium/state_trackers/nine}/meson.build (50%)
create mode 100644 src/gallium/targets/d3dadapter9/meson.build
diff --git a/include/meson.build b/include/meson.build
index b5f533bd185..54e454d82a4 100644
--- a/include/meson.build
+++ b/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(
@@ -66,3 +67,10 @@ if with_egl
subdir : 'EGL',
)
endif
+
+if with_gallium_st_nine
+ install_headers(
+ 'd3dadapter/d3dadapter9.h', 'd3dadapter/drm.h', 'd3dadapter/present.h',
+ subdir : 'd3dadapter',
+ )
+endif
diff --git a/meson.build b/meson.build
index 7801736c91a..919f1c2d417 100644
--- a/meson.build
+++ b/meson.build
@@ -1100,7 +1100,23 @@ if with_platform_x11
endif
endif
-# TODO: nine
+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
# TODO: clover
diff --git a/meson_options.txt b/meson_options.txt
index 49ebc05296d..9e7e8519f0f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -108,6 +108,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',
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index e700d03da93..7e841633a9c 100644
--- a/src/gallium/meson.build
+++ b/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
diff --git a/include/meson.build b/src/gallium/state_trackers/nine/meson.build
similarity index 50%
copy from include/meson.build
copy to src/gallium/state_trackers/nine/meson.build
index b5f533bd185..797ef389a69 100644
--- a/include/meson.build
+++ b/src/gallium/state_trackers/nine/meson.build
@@ -18,51 +18,52 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_drm_uapi = include_directories('drm-uapi')
-inc_vulkan = include_directories('vulkan')
+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',
+)
-if with_gles1
- install_headers(
- 'GLES/egl.h', 'GLES/gl.h', 'GLES/glext.h', 'GLES/glplatform.h',
- subdir : 'GLES',
- )
-endif
-
-if with_gles2
- install_headers(
- 'GLES2/gl2.h', 'GLES2/gl2ext.h', 'GLES2/gl2platform.h',
- subdir : 'GLES2',
- )
- install_headers(
- 'GLES3/gl3.h', 'GLES3/gl32.h', 'GLES3/gl32.h', 'GLES3/gl3ext.h',
- 'GLES3/gl3platform.h',
- subdir : 'GLES3',
- )
-endif
-
-if with_gles1 or with_gles2 # or with_egl
- install_headers('KHR/khrplatform.h', subdir : 'KHR')
-endif
-
-if with_opengl
- install_headers(
- 'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h', 'GL/gl_mangle.h',
- subdir : 'GL',
- )
-endif
-
-if with_glx != 'disabled'
- install_headers('GL/glx.h', 'GL/glext.h', 'GL/glx_mangle.h', subdir : 'GL')
-endif
-
-if with_osmesa != 'none'
- install_headers('GL/osmesa.h', subdir : 'GL')
-endif
-
-if with_egl
- install_headers(
- 'EGL/eglext.h', 'EGL/egl.h', 'EGL/eglextchromium.h', 'EGL/eglmesaext.h',
- 'EGL/eglplatform.h',
- subdir : 'EGL',
- )
-endif
+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,
+ ],
+)
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
new file mode 100644
index 00000000000..27a87972215
--- /dev/null
+++ b/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,
+ 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',
+)
--
2.15.0
More information about the mesa-dev
mailing list