diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/meson.build | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/meson.build | 87 |
4 files changed, 94 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 2a89b6482f9..5ca5c64954a 100644 --- a/meson.build +++ b/meson.build @@ -87,12 +87,14 @@ endif with_dri = false with_dri_i915 = false with_dri_i965 = false +with_dri_r100 = false with_dri_swrast = false _drivers = get_option('dri-drivers') if _drivers != '' _split = _drivers.split(',') with_dri_i915 = _split.contains('i915') with_dri_i965 = _split.contains('i965') + with_dri_r100 = _split.contains('r100') with_dri_swrast = _split.contains('swrast') with_dri = true endif @@ -627,7 +629,7 @@ dep_libdrm_freedreno = [] if with_amd_vk or with_gallium_radeonsi dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.85') endif -if with_gallium_radeonsi # older radeon too +if with_gallium_radeonsi or with_dri_r100 # older radeon too dep_libdrm_radeon = dependency('libdrm_radeon', version : '>= 2.4.71') endif if with_gallium_nouveau diff --git a/meson_options.txt b/meson_options.txt index b44c93df001..b0d32cdc94f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -34,7 +34,7 @@ option( option( 'dri-drivers', type : 'string', - value : 'i915,i965', + value : 'i915,i965,r100', description : 'comma separated list of dri drivers to build.' ) option( diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 36079324d41..bb65fb25210 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -31,6 +31,9 @@ endif if with_dri_i965 subdir('i965') endif +if with_dri_r100 + subdir('radeon') +endif if dri_drivers != [] libmesa_dri_drivers = shared_library( diff --git a/src/mesa/drivers/dri/radeon/meson.build b/src/mesa/drivers/dri/radeon/meson.build new file mode 100644 index 00000000000..bed608258a7 --- /dev/null +++ b/src/mesa/drivers/dri/radeon/meson.build @@ -0,0 +1,87 @@ +# 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_r100 = files( + 'radeon_buffer_objects.c', + 'radeon_buffer_objects.h', + 'radeon_cmdbuf.h', + 'radeon_common.c', + 'radeon_common_context.c', + 'radeon_common_context.h', + 'radeon_common.h', + 'radeon_debug.c', + 'radeon_debug.h', + 'radeon_dma.c', + 'radeon_dma.h', + 'radeon_fbo.c', + 'radeon_fog.c', + 'radeon_fog.h', + 'radeon_mipmap_tree.c', + 'radeon_mipmap_tree.h', + 'radeon_pixel_read.c', + 'radeon_queryobj.c', + 'radeon_queryobj.h', + 'radeon_span.c', + 'radeon_span.h', + 'radeon_tex_copy.c', + 'radeon_texture.c', + 'radeon_texture.h', + 'radeon_tile.c', + 'radeon_tile.h', + 'radeon_blit.c', + 'radeon_blit.h', + 'radeon_context.c', + 'radeon_context.h', + 'radeon_chipset.h', + 'radeon_ioctl.c', + 'radeon_ioctl.h', + 'radeon_maos.c', + 'radeon_maos.h', + 'radeon_maos_vbtmp.h', + 'radeon_sanity.c', + 'radeon_sanity.h', + 'radeon_screen.c', + 'radeon_screen.h', + 'radeon_state.c', + 'radeon_state.h', + 'radeon_state_init.c', + 'radeon_swtcl.c', + 'radeon_swtcl.h', + 'radeon_tcl.c', + 'radeon_tcl.h', + 'radeon_tex.c', + 'radeon_tex.h', + 'radeon_texstate.c', + 'server/radeon_reg.h', +) + +libr100 = static_library( + 'r100', + [files_r100, xmlpool_options_h], + include_directories : [ + inc_common, inc_dri_common, inc_util, include_directories('server'), + ], + c_args : [c_vis_args, '-DRADEON_R100'], + cpp_args : [cpp_vis_args], + dependencies : [dep_libdrm, dep_libdrm_radeon], +) + +dri_drivers += libr100 +dri_link += 'radeon_dri.so' |