summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-10-30 17:40:30 -0700
committerDylan Baker <[email protected]>2017-12-04 14:36:56 -0800
commit0ba909f0f111824223bc38563d1a6bc73e69c2cc (patch)
treee955bbc44285b4acc960fe5e30201a04574ebd51 /src/gallium
parent5a785d51a6d68ec676cea6220f75bad95a3221dc (diff)
meson: build gallium xa state tracker
Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/meson.build7
-rw-r--r--src/gallium/state_trackers/xa/meson.build45
-rw-r--r--src/gallium/targets/xa/meson.build59
3 files changed, 110 insertions, 1 deletions
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 41c29127923..e700d03da93 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -131,6 +131,9 @@ endif
if with_gallium_va
subdir('state_trackers/va')
endif
+if with_gallium_xa
+ subdir('state_trackers/xa')
+endif
# TODO: SWR
# TODO: clover
if with_dri
@@ -158,6 +161,8 @@ endif
if with_gallium_va
subdir('targets/va')
endif
-# TODO: xa
+if with_gallium_xa
+ subdir('targets/xa')
+endif
# TODO: nine
# TODO: tests
diff --git a/src/gallium/state_trackers/xa/meson.build b/src/gallium/state_trackers/xa/meson.build
new file mode 100644
index 00000000000..109abc10b7d
--- /dev/null
+++ b/src/gallium/state_trackers/xa/meson.build
@@ -0,0 +1,45 @@
+# 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.
+
+xa_version = ['2', '3', '0']
+
+xa_conf = configuration_data()
+xa_conf.set('XA_MAJOR', xa_version[0])
+xa_conf.set('XA_MINOR', xa_version[1])
+xa_conf.set('XA_PATCH', xa_version[2])
+
+xa_tracker_h = configure_file(
+ configuration : xa_conf,
+ input : 'xa_tracker.h.in',
+ output : 'xa_tracker.h',
+ install_dir : get_option('includedir'),
+)
+
+libxa_st = static_library(
+ 'xa_st',
+ [xa_tracker_h, files(
+ 'xa_composite.c', 'xa_context.c', 'xa_renderer.c', 'xa_tgsi.c',
+ 'xa_tracker.c', 'xa_yuv.c',
+ )],
+ c_args : [c_vis_args, '-pedantic'],
+ include_directories : inc_common,
+)
+
+install_headers('xa_composite.h', 'xa_context.h')
diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
new file mode 100644
index 00000000000..f16921dfc9c
--- /dev/null
+++ b/src/gallium/targets/xa/meson.build
@@ -0,0 +1,59 @@
+# 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.
+
+# TODO: support non-static targets
+# Static targets are always enabled in autotools (unless you modify
+# configure.ac)
+
+xa_link_args = []
+xa_link_depends = []
+
+if with_ld_version_script
+ xa_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'xa.sym')]
+ xa_link_depends += files('xa.sym')
+endif
+
+libxatracker = shared_library(
+ 'xatracker',
+ 'target.c',
+ c_args : c_vis_args,
+ cpp_args : cpp_vis_args,
+ link_args : [xa_link_args, ld_args_gc_sections],
+ include_directories : [
+ inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+ ],
+ link_with : [
+ libxa_st, libgalliumvl_stub, libgallium, libmesa_util, libnir,
+ libpipe_loader_static, libws_null, libwsw,
+ ],
+ link_depends : xa_link_depends,
+ dependencies : [
+ dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
+ driver_nouveau, driver_i915, driver_svga, driver_freedreno,
+ ],
+ install : true,
+)
+
+pkg.generate(
+ name : 'xatracker',
+ description : 'Xorg gallium3D acceleration library',
+ version : '.'.join(xa_version),
+ libraries : libxatracker,
+)