[Mesa-dev] [PATCH v5 06/13] meson: build virgl driver
Dylan Baker
dylan at pnwbakers.com
Mon Nov 20 19:09:38 UTC 2017
Build tested only.
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
meson.build | 16 ++++++++----
src/gallium/drivers/virgl/meson.build | 39 ++++++++++++++++++++++++++++++
src/gallium/meson.build | 7 +++++-
src/gallium/targets/dri/meson.build | 5 ++++
src/gallium/winsys/virgl/drm/meson.build | 27 +++++++++++++++++++++
src/gallium/winsys/virgl/vtest/meson.build | 26 ++++++++++++++++++++
6 files changed, 114 insertions(+), 6 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 532176d2121..7452066a167 100644
--- a/meson.build
+++ b/meson.build
@@ -129,14 +129,15 @@ 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 == 'auto'
if not ['darwin', 'windows'].contains(host_machine.system())
# TODO: PPC, Sparc
if ['x86', 'x86_64'].contains(host_machine.cpu_family())
- _drivers = 'r300,r600,radeonsi,nouveau,svga,swrast'
+ _drivers = 'r300,r600,radeonsi,nouveau,virgl,svga,swrast'
elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
- _drivers = 'pl111,vc4,vc5,freedreno,etnaviv,imx,svga,swrast'
+ _drivers = 'pl111,vc4,vc5,freedreno,etnaviv,imx,virgl,svga,swrast'
else
error('Unknown architecture. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.')
endif
@@ -159,6 +160,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
endif
@@ -273,9 +275,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/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 2a4cb66ad7a..8e8b1466f12 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
@@ -85,6 +86,11 @@ if with_gallium_svga
subdir('drivers/svga')
subdir('winsys/svga/drm')
endif
+if with_gallium_virgl
+ subdir('drivers/virgl')
+ subdir('winsys/virgl/drm')
+ subdir('winsys/virgl/vtest')
+endif
subdir('state_trackers/dri')
if with_osmesa == 'gallium'
subdir('state_trackers/osmesa')
@@ -94,7 +100,6 @@ if with_glx == 'gallium-xlib'
subdir('state_trackers/glx/xlib')
endif
# TODO: SWR
-# TODO: virgl
# TODO: clover
if with_dri and with_gallium
subdir('targets/dri')
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 93038afe4c3..e90a8f6bed7 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.15.0
More information about the mesa-dev
mailing list