From 79488fd111890dc2e38267852c40d66711acc281 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Tue, 22 Nov 2022 17:46:12 +0800 Subject: [PATCH] gallivm: use valid LLVM_VERSION_MAJOR instead of LLVM_VERSION Partial of: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7680 Fixes: 203920d4c69 ("gallivm: add atomic 32-bit float support") Signed-off-by: Yonggang Luo Reviewed-by: Eric Engestrom Part-of: (cherry picked from commit b461921ed80abe357cb90f63db3dfc0a1390423c) --- .pick_status.json | 2 +- src/gallium/auxiliary/gallivm/lp_bld_nir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1b3898a..baf8684 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1975,7 +1975,7 @@ "description": "gallivm: use valid LLVM_VERSION_MAJOR instead of LLVM_VERSION", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "203920d4c69366b71db1d48d8fb8bd6439016191" }, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index 4afeebf..78a3c7c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -1736,7 +1736,7 @@ visit_atomic_image(struct lp_build_nir_context *bld_base, case nir_intrinsic_image_atomic_fadd: params.op = LLVMAtomicRMWBinOpFAdd; break; -#if LLVM_VERSION >= 15 +#if LLVM_VERSION_MAJOR >= 15 case nir_intrinsic_image_atomic_fmin: params.op = LLVMAtomicRMWBinOpFMin; break; -- 2.7.4