diff options
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/meson.build | 88 | ||||
| -rw-r--r-- | src/gallium/meson.build | 5 | ||||
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 5 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/meson.build | 45 |
5 files changed, 146 insertions, 3 deletions
diff --git a/meson.build b/meson.build index be727bb47d7..956d695373d 100644 --- a/meson.build +++ b/meson.build @@ -122,14 +122,15 @@ 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 == '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,swrast' + _drivers = 'r300,r600,radeonsi,nouveau,svga,swrast' elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) - _drivers = 'pl111,vc4,vc5,freedreno,etnaviv,imx,swrast' + _drivers = 'pl111,vc4,vc5,freedreno,etnaviv,imx,svga,swrast' else error('Unknown architecture. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.') endif @@ -151,6 +152,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 endif 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 cfb784c523d..6fe7f15da03 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -81,6 +81,10 @@ if with_gallium_i915 subdir('winsys/i915/drm') subdir('drivers/i915') endif +if with_gallium_svga + subdir('drivers/svga') + subdir('winsys/svga/drm') +endif if with_dri subdir('state_trackers/dri') endif @@ -91,7 +95,6 @@ if with_glx == 'gallium-xlib' subdir('winsys/sw/xlib') subdir('state_trackers/glx/xlib') endif -# TODO: SVGA # TODO: SWR # TODO: virgl # TODO: clover diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 8bcef801dbe..79dc046f896 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -122,6 +122,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, +) |