diff options
| author | Eric Engestrom <[email protected]> | 2019-08-28 00:06:03 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-09-06 22:26:29 +0100 |
| commit | 19d9e57f2c0c3e6cd9809dbc6ef65eab163ee255 (patch) | |
| tree | bd3a0e3b9cb58cc0354639b2ce0f6c65485ba1aa /src/amd/vulkan | |
| parent | bce9c05ca8820bb0f31976e35674485b2ec15a8d (diff) | |
amd: replace major llvm version checks with LLVM_VERSION_MAJOR
Signed-off-by: Eric Engestrom <[email protected]>
Acked-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 9 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_extensions.py | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 265a7bd7912..b9d6ccc4c03 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -29,6 +29,7 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> +#include <llvm/Config/llvm-config.h> #include "radv_debug.h" #include "radv_private.h" #include "radv_shader.h" @@ -531,7 +532,7 @@ radv_handle_per_app_options(struct radv_instance *instance, * load/store memory operations. * See https://reviews.llvm.org/D61313 */ - if (HAVE_LLVM < 0x900) + if (LLVM_VERSION_MAJOR < 9) instance->debug_flags |= RADV_DEBUG_NO_LOAD_STORE_OPT; } else if (!strcmp(name, "Wolfenstein: Youngblood")) { if (!(instance->debug_flags & RADV_DEBUG_NO_SHADER_BALLOT)) { @@ -857,7 +858,7 @@ void radv_GetPhysicalDeviceFeatures2( features->storageBuffer16BitAccess = enabled; features->uniformAndStorageBuffer16BitAccess = enabled; features->storagePushConstant16 = enabled; - features->storageInputOutput16 = enabled && HAVE_LLVM >= 0x900; + features->storageInputOutput16 = enabled && LLVM_VERSION_MAJOR >= 9; break; } case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES: { @@ -963,8 +964,8 @@ void radv_GetPhysicalDeviceFeatures2( case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR: { VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *features = (VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *)ext; - features->shaderBufferInt64Atomics = HAVE_LLVM >= 0x0900; - features->shaderSharedInt64Atomics = HAVE_LLVM >= 0x0900; + features->shaderBufferInt64Atomics = LLVM_VERSION_MAJOR >= 9; + features->shaderSharedInt64Atomics = LLVM_VERSION_MAJOR >= 9; break; } case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT: { diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 34d63ed90c3..4bb4c4dfc23 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -85,7 +85,7 @@ EXTENSIONS = [ Extension('VK_KHR_relaxed_block_layout', 1, True), Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True), Extension('VK_KHR_sampler_ycbcr_conversion', 1, True), - Extension('VK_KHR_shader_atomic_int64', 1, 'HAVE_LLVM >= 0x0900'), + Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9'), Extension('VK_KHR_shader_draw_parameters', 1, True), Extension('VK_KHR_shader_float16_int8', 1, True), Extension('VK_KHR_storage_buffer_storage_class', 1, True), diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c index 7e861736f23..c85bbe4cee8 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -33,6 +33,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <llvm/Config/llvm-config.h> #include <amdgpu_drm.h> #include <assert.h> #include "radv_amdgpu_cs.h" @@ -46,7 +47,7 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd) return false; /* LLVM 9.0 is required for GFX10. */ - if (ws->info.chip_class == GFX10 && HAVE_LLVM < 0x0900) { + if (ws->info.chip_class == GFX10 && LLVM_VERSION_MAJOR < 9) { fprintf(stderr, "radv: Navi family support requires LLVM 9 or higher\n"); return false; } |