Build tested only.
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
meson.build | 2 +
meson_options.txt | 2 +-
src/gallium/drivers/svga/meson.build | 88 +++++++++++++++++++++++++++++++++
src/gallium/meson.build | 7 ++-
src/gallium/targets/dri/meson.build | 5 ++
src/gallium/winsys/svga/drm/meson.build | 45 +++++++++++++++++
6 files changed, 147 insertions(+), 2 deletions(-)
create mode 100644 src/gallium/drivers/svga/meson.build
create mode 100644 src/gallium/winsys/svga/drm/meson.build
diff --git a/meson.build b/meson.build
index 1b7972c97e3..253dea57c51 100644
--- a/meson.build
+++ b/meson.build
@@ -114,6 +114,7 @@ with_gallium_vc5 = false
with_gallium_etnaviv = false
with_gallium_imx = false
with_gallium_i915 = false
+with_gallium_svga = false
_drivers = get_option('gallium-drivers')
if _drivers != ''
_split = _drivers.split(',')
@@ -129,6 +130,7 @@ if _drivers != ''
with_gallium_etnaviv = _split.contains('etnaviv')
with_gallium_imx = _split.contains('imx')
with_gallium_i915 = _split.contains('i915')
+ with_gallium_svga = _split.contains('svga')
with_gallium = true
with_dri = true
endif
diff --git a/meson_options.txt b/meson_options.txt
index 2d21a10425f..41db2555fe9 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',
+ value :
'pl111,radeonsi,nouveau,freedreno,swrast,vc4,etnaviv,imx,r300,r600,svga',
description : 'comma separated list of gallium drivers to build.'
)
option(
diff --git a/src/gallium/drivers/svga/meson.build
b/src/gallium/drivers/svga/meson.build
new file mode 100644
index 00000000000..d9a7da95a33
--- /dev/null
+++ b/src/gallium/drivers/svga/meson.build
@@ -0,0 +1,88 @@
+# 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_svga = files(
+ 'svga_cmd.c',
+ 'svga_cmd_vgpu10.c',
+ 'svga_context.c',
+ 'svga_draw_arrays.c',
+ 'svga_draw.c',
+ 'svga_draw_elements.c',
+ 'svga_format.c',
+ 'svga_link.c',
+ 'svga_msg.c',
+ 'svga_pipe_blend.c',
+ 'svga_pipe_blit.c',
+ 'svga_pipe_clear.c',
+ 'svga_pipe_constants.c',
+ 'svga_pipe_depthstencil.c',
+ 'svga_pipe_draw.c',
+ 'svga_pipe_flush.c',
+ 'svga_pipe_fs.c',
+ 'svga_pipe_gs.c',
+ 'svga_pipe_misc.c',
+ 'svga_pipe_query.c',
+ 'svga_pipe_rasterizer.c',
+ 'svga_pipe_sampler.c',
+ 'svga_pipe_streamout.c',
+ 'svga_pipe_vertex.c',
+ 'svga_pipe_vs.c',
+ 'svga_resource_buffer.c',
+ 'svga_resource_buffer_upload.c',
+ 'svga_resource.c',
+ 'svga_resource_texture.c',
+ 'svga_sampler_view.c',
+ 'svga_screen.c',
+ 'svga_screen_cache.c',
+ 'svga_shader.c',
+ 'svga_state.c',
+ 'svga_state_constants.c',
+ 'svga_state_framebuffer.c',
+ 'svga_state_fs.c',
+ 'svga_state_gs.c',
+ 'svga_state_need_swtnl.c',
+ 'svga_state_rss.c',
+ 'svga_state_sampler.c',
+ 'svga_state_tgsi_transform.c',
+ 'svga_state_tss.c',
+ 'svga_state_vdecl.c',
+ 'svga_state_vs.c',
+ 'svga_surface.c',
+ 'svga_swtnl_backend.c',
+ 'svga_swtnl_draw.c',
+ 'svga_swtnl_state.c',
+ 'svga_tgsi.c',
+ 'svga_tgsi_decl_sm30.c',
+ 'svga_tgsi_insn.c',
+ 'svga_tgsi_vgpu10.c',
+ 'svgadump/svga_dump.c',
+ 'svgadump/svga_shader_dump.c',
+ 'svgadump/svga_shader_op.c',
+)
+
+libsvga = static_library(
+ 'svga',
+ files_svga,
+ c_args : [c_vis_args, c_msvc_compat_args],
+ include_directories : [
+ inc_src, inc_include, inc_gallium, inc_gallium_aux,
+ include_directories('include')
+ ],
+)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 3ff7b994956..2140267105e 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -50,6 +50,9 @@ endif
if with_gallium_r600
subdir('drivers/r600')
endif
+if with_gallium_svga
+ subdir('drivers/svga')
+endif
subdir('drivers/llvmpipe')
subdir('winsys/sw/null')
subdir('winsys/sw/dri')
@@ -77,11 +80,13 @@ endif
if with_gallium_i915
subdir('winsys/i915/drm')
endif
+if with_gallium_svga
+ subdir('winsys/svga/drm')
+endif
subdir('state_trackers/dri')
if with_osmesa == 'gallium'
subdir('state_trackers/osmesa')
endif
-# TODO: SVGA
# TODO: SWR
# TODO: virgl
# TODO: winsys/sw/xlib
diff --git a/src/gallium/targets/dri/meson.build
b/src/gallium/targets/dri/meson.build
index 685995c1dcf..435d6cb813b 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -121,6 +121,11 @@ if with_gallium_r600
gallium_dri_link_with += libr600
gallium_dri_drivers += 'r600_dri.so'
endif
+if with_gallium_svga
+ gallium_dri_c_args += '-DGALLIUM_VMWGFX'
+ gallium_dri_link_with += [libsvga, libsvgadrm]
+ gallium_dri_drivers += 'vmwgfx_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/svga/drm/meson.build
b/src/gallium/winsys/svga/drm/meson.build
new file mode 100644
index 00000000000..24f67aca9ec
--- /dev/null
+++ b/src/gallium/winsys/svga/drm/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.
+
+files_svgadrm = files(
+ 'pb_buffer_simple_fenced.c',
+ 'vmw_buffer.c',
+ 'vmw_context.c',
+ 'vmw_fence.c',
+ 'vmw_screen.c',
+ 'vmw_screen_dri.c',
+ 'vmw_screen_ioctl.c',
+ 'vmw_screen_pools.c',
+ 'vmw_screen_svga.c',
+ 'vmw_surface.c',
+ 'vmw_shader.c',
+ 'vmw_query.c',
+)
+
+libsvgadrm = static_library(
+ 'svgadrm',
+ files_svgadrm,
+ c_args : [c_vis_args, c_msvc_compat_args],
+ include_directories : [
+ inc_src, inc_include, inc_gallium, inc_gallium_aux,
+ include_directories('../../../drivers/svga',
'../../../drivers/svga/include'),
+ ],
+ dependencies : dep_libdrm,
+)
--
2.14.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
