From f55d1f806e6b6c33af559de166d08ec8fa3ebe90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Apr 2018 20:49:35 -0400 Subject: [PATCH] radeonsi: try to fix meson This is not fully tested. Meson can't link LLVM even though automake can. PATH=/usr/llvm/x86_64-linux-gnu/bin:$PATH meson build/ -Dgallium-va=false \ -Dplatforms=x11,drm -Dgallium-drivers=radeonsi -Ddri-drivers= \ -Dgallium-omx=disabled -Dgallium-xvmc=false -Dgles1=false \ -Dtexture-float=true -Dvulkan-drivers= src/gallium/auxiliary/libgallium.a(gallivm_lp_bld_misc.cpp.o): (.data.rel.ro._ZTI26DelegatingJITMemoryManager[_ZTI26DelegatingJITMemoryManager]+0x10): undefined reference to `typeinfo for llvm::RTDyldMemoryManager' Acked-by: Timothy Arceri --- src/gallium/drivers/radeon/meson.build | 59 -------------------------------- src/gallium/drivers/radeonsi/meson.build | 39 +++++++++++++++++---- src/gallium/meson.build | 1 - 3 files changed, 33 insertions(+), 66 deletions(-) delete mode 100644 src/gallium/drivers/radeon/meson.build diff --git a/src/gallium/drivers/radeon/meson.build b/src/gallium/drivers/radeon/meson.build deleted file mode 100644 index 582a5ff..0000000 --- a/src/gallium/drivers/radeon/meson.build +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright © 2017 Dylan Baker - -# 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_libradeon = files( - 'r600_buffer_common.c', - 'r600_cs.h', - 'r600_gpu_load.c', - 'r600_perfcounter.c', - 'r600_pipe_common.c', - 'r600_pipe_common.h', - 'r600_query.c', - 'r600_query.h', - 'r600_texture.c', - 'radeon_uvd.c', - 'radeon_uvd.h', - 'radeon_vcn_enc_1_2.c', - 'radeon_vcn_enc.c', - 'radeon_vcn_enc.h', - 'radeon_vcn_dec.c', - 'radeon_vcn_dec.h', - 'radeon_uvd_enc_1_1.c', - 'radeon_uvd_enc.c', - 'radeon_uvd_enc.h', - 'radeon_vce_40_2_2.c', - 'radeon_vce_50.c', - 'radeon_vce_52.c', - 'radeon_vce.c', - 'radeon_vce.h', - 'radeon_video.c', - 'radeon_video.h', - 'radeon_winsys.h', -) - -libradeon = static_library( - 'radeon', - files_libradeon, - c_args : ['-Wstrict-overflow=0', c_vis_args], - dependencies : [dep_llvm, dep_clock], - include_directories : [ - inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_amd_common, - ], -) diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index 9a62d14..f817d591 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -22,6 +22,8 @@ files_libradeonsi = files( 'cik_sdma.c', 'driinfo_radeonsi.h', 'si_blit.c', + 'si_buffer.c', + 'si_build_pm4.h', 'si_clear.c', 'si_compute.c', 'si_compute.h', @@ -29,15 +31,19 @@ files_libradeonsi = files( 'si_debug.c', 'si_descriptors.c', 'si_dma.c', + 'si_dma_cs.c', 'si_fence.c', 'si_get.c', - 'si_hw_context.c', + 'si_gfx_cs.c', + 'si_gpu_load.c', + 'si_perfcounter.c', 'si_pipe.c', 'si_pipe.h', 'si_pm4.c', 'si_pm4.h', - 'si_perfcounter.c', 'si_public.h', + 'si_query.c', + 'si_query.h', 'si_shader.c', 'si_shader.h', 'si_shader_internal.h', @@ -46,15 +52,36 @@ files_libradeonsi = files( 'si_shader_tgsi_mem.c', 'si_shader_tgsi_setup.c', 'si_state.c', + 'si_state.h', 'si_state_binning.c', 'si_state_draw.c', 'si_state_msaa.c', 'si_state_shaders.c', 'si_state_streamout.c', 'si_state_viewport.c', - 'si_state.h', 'si_test_dma.c', + 'si_texture.c', 'si_uvd.c', + '../radeon/r600_perfcounter.c', + '../radeon/r600_pipe_common.h', + '../radeon/radeon_uvd.c', + '../radeon/radeon_uvd.h', + '../radeon/radeon_vcn_enc_1_2.c', + '../radeon/radeon_vcn_enc.c', + '../radeon/radeon_vcn_enc.h', + '../radeon/radeon_vcn_dec.c', + '../radeon/radeon_vcn_dec.h', + '../radeon/radeon_uvd_enc_1_1.c', + '../radeon/radeon_uvd_enc.c', + '../radeon/radeon_uvd_enc.h', + '../radeon/radeon_vce_40_2_2.c', + '../radeon/radeon_vce_50.c', + '../radeon/radeon_vce_52.c', + '../radeon/radeon_vce.c', + '../radeon/radeon_vce.h', + '../radeon/radeon_video.c', + '../radeon/radeon_video.h', + '../radeon/radeon_winsys.h', ) si_driinfo_h = custom_target( @@ -75,16 +102,16 @@ libradeonsi = static_library( inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, ], - c_args : [c_vis_args], + c_args : ['-Wstrict-overflow=0', c_vis_args], cpp_args : [cpp_vis_args], - dependencies : [dep_llvm, dep_libdrm_radeon, idep_nir_headers], + dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers], ) driver_radeonsi = declare_dependency( compile_args : '-DGALLIUM_RADEONSI', sources : si_driinfo_h, link_with : [ - libradeonsi, libradeon, libradeonwinsys, libamdgpuwinsys, libamd_common, + libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, ], dependencies : idep_nir, ) diff --git a/src/gallium/meson.build b/src/gallium/meson.build index c9bfc0b..6822511 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -74,7 +74,6 @@ else endif if with_gallium_radeonsi subdir('winsys/amdgpu/drm') - subdir('drivers/radeon') subdir('drivers/radeonsi') else driver_radeonsi = declare_dependency() -- 2.7.4