OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/swr: Remove common code and build options

Browse Source 
This commit removes all OpenSWR references from common Mesa code
and build system.

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11264>
This commit is contained in:
Jan Zielinski
2021-06-09 14:16:23 +02:00
committed by Marge Bot
parent 855793c6c6
commit e2de00876a
13 changed files with 15 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@@ -66,7 +66,6 @@ with_aco_tests = get_option('build-aco-tests')
with_glx_read_only_text = get_option('glx-read-only-text')
with_glx_direct = get_option('glx-direct')
with_osmesa = get_option('osmesa')
with_swr_arches = get_option('swr-arches')
with_vulkan_overlay_layer = get_option('vulkan-layers').contains('overlay')
with_vulkan_device_select_layer = get_option('vulkan-layers').contains('device-select')
with_tools = get_option('tools')
@@ -225,7 +224,6 @@ with_gallium_iris = gallium_drivers.contains('iris')
with_gallium_i915 = gallium_drivers.contains('i915')
with_gallium_svga = gallium_drivers.contains('svga')
with_gallium_virgl = gallium_drivers.contains('virgl')
with_gallium_swr = gallium_drivers.contains('swr')
with_gallium_lima = gallium_drivers.contains('lima')
with_gallium_zink = gallium_drivers.contains('zink')
with_gallium_d3d12 = gallium_drivers.contains('d3d12')
@@ -1643,8 +1641,6 @@ elif with_clc
_llvm_version = '>= 10.0.0'
elif with_gallium_opencl
_llvm_version = '>= 8.0.0'
elif with_gallium_swr
_llvm_version = '>= 6.0.0'
else
_llvm_version = '>= 3.9.0'
endif
@@ -1691,8 +1687,8 @@ if _llvm != 'disabled'
modules : llvm_modules,
optional_modules : llvm_optional_modules,
required : (
with_amd_vk or with_gallium_radeonsi or with_gallium_swr or
with_gallium_opencl or with_clc or _llvm == 'enabled'
with_amd_vk or with_gallium_radeonsi or with_gallium_opencl or with_clc
or _llvm == 'enabled'
),
static : not _shared_llvm,
method : _llvm_method,
@@ -1710,8 +1706,6 @@ if with_llvm
pre_args += '-DDRAW_LLVM_AVAILABLE'
elif with_swrast_vk
error('Lavapipe requires LLVM draw support.')
elif with_gallium_swr
error('SWR requires LLVM draw support.')
endif
if cc.get_id() != 'msvc'
@@ -1745,7 +1739,7 @@ if with_llvm
endif
elif with_amd_vk and with_aco_tests
error('ACO tests require LLVM, but LLVM is disabled.')
elif with_gallium_radeonsi or with_gallium_swr or with_swrast_vk
elif with_gallium_radeonsi or with_swrast_vk
error('The following drivers require LLVM: RadeonSI, SWR, Lavapipe. One of these is enabled, but LLVM is disabled.')
elif with_gallium_opencl
error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.')