From c9a9b363ce1682ef8f8d125744f5d32011332009 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 4 Jun 2020 14:53:20 +0200 Subject: [PATCH] radv/aco: enable 64-bit atomic features if RADV is linked with LLVM 8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Just in case someone links RADV with this old LLVM 8 and wants ACO. Signed-off-by: Samuel Pitoiset Reviewed-by: Daniel Schürmann Part-of: --- src/amd/vulkan/radv_device.c | 4 ++-- src/amd/vulkan/radv_extensions.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 4d3d0dea3e4..674e21e02cc 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -981,8 +981,8 @@ radv_get_physical_device_features_1_2(struct radv_physical_device *pdevice, f->storageBuffer8BitAccess = !pdevice->use_aco || pdevice->rad_info.chip_class >= GFX8; f->uniformAndStorageBuffer8BitAccess = !pdevice->use_aco || pdevice->rad_info.chip_class >= GFX8; f->storagePushConstant8 = !pdevice->use_aco || pdevice->rad_info.chip_class >= GFX8; - f->shaderBufferInt64Atomics = LLVM_VERSION_MAJOR >= 9; - f->shaderSharedInt64Atomics = LLVM_VERSION_MAJOR >= 9; + f->shaderBufferInt64Atomics = LLVM_VERSION_MAJOR >= 9 || pdevice->use_aco; + f->shaderSharedInt64Atomics = LLVM_VERSION_MAJOR >= 9 || pdevice->use_aco; f->shaderFloat16 = pdevice->rad_info.has_packed_math_16bit && !pdevice->use_aco; f->shaderInt8 = !pdevice->use_aco || pdevice->rad_info.chip_class >= GFX8; diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index ffe1dae8dae..fe9c9655625 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -94,7 +94,7 @@ EXTENSIONS = [ Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True), Extension('VK_KHR_sampler_ycbcr_conversion', 1, True), Extension('VK_KHR_separate_depth_stencil_layouts', 1, True), - Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9'), + Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9 || device->use_aco'), Extension('VK_KHR_shader_clock', 1, True), Extension('VK_KHR_shader_draw_parameters', 1, True), Extension('VK_KHR_shader_float_controls', 1, True), -- 2.30.2