[Mesa-dev] [PATCH 7/7] meson: build virgl driver
Dylan Baker
dylan at pnwbakers.com
Thu Oct 26 23:57:07 UTC 2017
Build tested only.
cc: Dave Airlie <airlied at redhat.com>
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
meson.build | 12 ++++++---
meson_options.txt | 2 +-
src/gallium/drivers/virgl/meson.build | 39 ++++++++++++++++++++++++++++++
src/gallium/meson.build | 8 ++++++
src/gallium/targets/dri/meson.build | 5 ++++
src/gallium/winsys/virgl/drm/meson.build | 27 +++++++++++++++++++++
src/gallium/winsys/virgl/vtest/meson.build | 26 ++++++++++++++++++++
7 files changed, 115 insertions(+), 4 deletions(-)
create mode 100644 src/gallium/drivers/virgl/meson.build
create mode 100644 src/gallium/winsys/virgl/drm/meson.build
create mode 100644 src/gallium/winsys/virgl/vtest/meson.build
diff --git a/meson.build b/meson.build
index ad2025076a5..6253e905fb3 100644
--- a/meson.build
+++ b/meson.build
@@ -117,6 +117,7 @@ with_gallium_etnaviv = false
with_gallium_imx = false
with_gallium_i915 = false
with_gallium_svga = false
+with_gallium_virgl = false
_drivers = get_option('gallium-drivers')
if _drivers != ''
_split = _drivers.split(',')
@@ -133,6 +134,7 @@ if _drivers != ''
with_gallium_imx = _split.contains('imx')
with_gallium_i915 = _split.contains('i915')
with_gallium_svga = _split.contains('svga')
+ with_gallium_virgl = _split.contains('virgl')
with_gallium = true
with_dri = true
endif
@@ -207,9 +209,13 @@ else
with_egl = false
endif
-# TODO: or virgl
-if with_egl and with_gallium_radeonsi and not (with_platform_drm or with_platform_surfaceless)
- error('RadeonSI requires drm or surfaceless platform when using EGL')
+if with_egl and not (with_platform_drm or with_platform_surfaceless)
+ if with_gallium_radeonsi
+ error('RadeonSI requires drm or surfaceless platform when using EGL')
+ endif
+ if with_gallium_virgl
+ error('Virgl requires drm or surfaceless platform when using EGL')
+ endif
endif
pre_args += '-DGLX_USE_TLS'
diff --git a/meson_options.txt b/meson_options.txt
index bda9601ea4e..c5403c7decb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,7 +46,7 @@ option(
option(
'gallium-drivers',
type : 'string',
- value : 'pl111,radeonsi,nouveau,freedreno,swrast,vc4,etnaviv,imx,r300,r600,svga',
+ value : 'pl111,radeonsi,nouveau,freedreno,swrast,vc4,etnaviv,imx,r300,r600,svga,virgl',
description : 'comma separated list of gallium drivers to build.'
)
option(
diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build
new file mode 100644
index 00000000000..8284f548927
--- /dev/null
+++ b/src/gallium/drivers/virgl/meson.build
@@ -0,0 +1,39 @@
+# 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.
+
+files_libvirgl = files(
+ 'virgl_buffer.c',
+ 'virgl_context.c',
+ 'virgl_encode.c',
+ 'virgl_query.c',
+ 'virgl_resource.c',
+ 'virgl_screen.c',
+ 'virgl_streamout.c',
+ 'virgl_texture.c',
+ 'virgl_tgsi.c',
+)
+
+libvirgl = static_library(
+ 'virgl',
+ files_libvirgl,
+ c_args : c_vis_args,
+ include_directories : inc_common,
+ dependencies : dep_libdrm,
+)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 155800ffc8e..0772052f0bd 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -1,4 +1,5 @@
# Copyright © 2017 Dylan Baker
+# 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
@@ -54,6 +55,9 @@ endif
if with_gallium_svga
subdir('drivers/svga')
endif
+if with_gallium_virgl
+ subdir('drivers/virgl')
+endif
subdir('drivers/llvmpipe')
subdir('winsys/sw/null')
subdir('winsys/sw/dri')
@@ -84,6 +88,10 @@ endif
if with_gallium_svga
subdir('winsys/svga/drm')
endif
+if with_gallium_virgl
+ subdir('winsys/virgl/drm')
+ subdir('winsys/virgl/vtest')
+endif
subdir('state_trackers/dri')
# TODO: SWR
# TODO: virgl
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 435d6cb813b..98901521a4e 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -126,6 +126,11 @@ if with_gallium_svga
gallium_dri_link_with += [libsvga, libsvgadrm]
gallium_dri_drivers += 'vmwgfx_dri.so'
endif
+if with_gallium_virgl
+ gallium_dri_c_args += '-DGALLIUM_VIRGL'
+ gallium_dri_link_with += [libvirgl, libvirgldrm, libvirglvtest]
+ gallium_dri_drivers += 'virtio_gpu_dri.so'
+endif
if with_gallium_radeonsi or with_gallium_r300 or with_gallium_r600
gallium_dri_link_with += libradeonwinsys
diff --git a/src/gallium/winsys/virgl/drm/meson.build b/src/gallium/winsys/virgl/drm/meson.build
new file mode 100644
index 00000000000..89626e78637
--- /dev/null
+++ b/src/gallium/winsys/virgl/drm/meson.build
@@ -0,0 +1,27 @@
+# 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.
+
+libvirgldrm = static_library(
+ 'virgldrm',
+ 'virgl_drm_winsys.c',
+ c_args : c_vis_args,
+ include_directories : [inc_common, inc_gallium_drivers],
+ dependencies : dep_libdrm,
+)
diff --git a/src/gallium/winsys/virgl/vtest/meson.build b/src/gallium/winsys/virgl/vtest/meson.build
new file mode 100644
index 00000000000..319bc8e241a
--- /dev/null
+++ b/src/gallium/winsys/virgl/vtest/meson.build
@@ -0,0 +1,26 @@
+# 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.
+
+libvirglvtest = static_library(
+ 'virglvtest',
+ ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
+ c_args : c_vis_args,
+ include_directories : [inc_common, inc_gallium_drivers],
+)
--
2.14.2
More information about the mesa-dev
mailing list