From 6a9ad20b7c989d0a35f738d33c34bb2ee7c82695 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 10 Oct 2017 14:56:39 -0700 Subject: [PATCH] meson: build llvmpipe Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt --- meson.build | 4 +- src/gallium/drivers/llvmpipe/meson.build | 116 +++++++++++++++++++++++ src/gallium/meson.build | 2 +- src/gallium/targets/dri/meson.build | 4 + 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 src/gallium/drivers/llvmpipe/meson.build diff --git a/meson.build b/meson.build index e96dc864986..bc3bbf41a65 100644 --- a/meson.build +++ b/meson.build @@ -589,7 +589,9 @@ if with_llvm '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), ] else - if with_amd_vk or with_gallium_radeonsi + if with_gallium_softpipe + error('Cannot find LLVM to build LLVMPipe. If you wanted softpipe pass -Dllvm=false to meson') + elif with_amd_vk or with_gallium_radeonsi # etc error('The following drivers requires LLVM: Radv, RadeonSI. One of these is enabled, but LLVM was not found.') endif endif diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build new file mode 100644 index 00000000000..ca1d2aa797b --- /dev/null +++ b/src/gallium/drivers/llvmpipe/meson.build @@ -0,0 +1,116 @@ +# 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_llvmpipe = files( + 'lp_bld_alpha.c', + 'lp_bld_alpha.h', + 'lp_bld_blend_aos.c', + 'lp_bld_blend.c', + 'lp_bld_blend.h', + 'lp_bld_blend_logicop.c', + 'lp_bld_depth.c', + 'lp_bld_depth.h', + 'lp_bld_interp.c', + 'lp_bld_interp.h', + 'lp_clear.c', + 'lp_clear.h', + 'lp_context.c', + 'lp_context.h', + 'lp_debug.h', + 'lp_draw_arrays.c', + 'lp_fence.c', + 'lp_fence.h', + 'lp_flush.c', + 'lp_flush.h', + 'lp_jit.c', + 'lp_jit.h', + 'lp_limits.h', + 'lp_memory.c', + 'lp_memory.h', + 'lp_perf.c', + 'lp_perf.h', + 'lp_public.h', + 'lp_query.c', + 'lp_query.h', + 'lp_rast.c', + 'lp_rast_debug.c', + 'lp_rast.h', + 'lp_rast_priv.h', + 'lp_rast_tri.c', + 'lp_rast_tri_tmp.h', + 'lp_scene.c', + 'lp_scene.h', + 'lp_scene_queue.c', + 'lp_scene_queue.h', + 'lp_screen.c', + 'lp_screen.h', + 'lp_setup.c', + 'lp_setup_context.h', + 'lp_setup.h', + 'lp_setup_line.c', + 'lp_setup_point.c', + 'lp_setup_tri.c', + 'lp_setup_vbuf.c', + 'lp_state_blend.c', + 'lp_state_clip.c', + 'lp_state_derived.c', + 'lp_state_fs.c', + 'lp_state_fs.h', + 'lp_state_gs.c', + 'lp_state.h', + 'lp_state_rasterizer.c', + 'lp_state_sampler.c', + 'lp_state_setup.c', + 'lp_state_setup.h', + 'lp_state_so.c', + 'lp_state_surface.c', + 'lp_state_vertex.c', + 'lp_state_vs.c', + 'lp_surface.c', + 'lp_surface.h', + 'lp_tex_sample.c', + 'lp_tex_sample.h', + 'lp_texture.c', + 'lp_texture.h', +) + +libllvmpipe = static_library( + 'llvmpipe', + files_llvmpipe, + c_args : [c_vis_args, c_msvc_compat_args], + cpp_args : [cpp_vis_args, cpp_msvc_compat_args], + include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src], + dependencies : dep_llvm, + build_by_default : false, +) + +if with_tests and with_gallium_softpipe and with_llvm + foreach t : ['lp_test_format', 'lp_test_arit', 'lp_test_blend', + 'lp_test_conv', 'lp_test_printf'] + test(t, executable( + t, + ['@0@.c'.format(t), 'lp_test_main.c'], + dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock], + include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src], + link_with : [libllvmpipe, libgallium, libmesa_util], + ) + ) + endforeach +endif diff --git a/src/gallium/meson.build b/src/gallium/meson.build index ea7f1d2ef64..e7970e11638 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -32,6 +32,7 @@ subdir('drivers/radeon') subdir('drivers/radeonsi') subdir('drivers/nouveau') subdir('drivers/softpipe') +subdir('drivers/llvmpipe') subdir('winsys/sw/null') subdir('winsys/sw/dri') subdir('winsys/sw/kms-dri') @@ -48,7 +49,6 @@ subdir('state_trackers/dri') # TODO: etnaviv # TODO: IMX # TODO: PL111 -# TODO: llvmpipe # TODO: SWR # TODO: vc4 # TODO: virgl diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 2601f151f0e..2dc0de6a4d0 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -71,6 +71,10 @@ if with_gallium_softpipe if with_gallium_drisw_kms gallium_dri_drivers += 'kms_swrast_dri.so' endif + if with_llvm + gallium_dri_c_args += '-DGALLIUM_LLVMPIPE' + gallium_dri_link_with += libllvmpipe + endif endif libgallium_dri = shared_library( -- 2.30.2