From 6120c442ee644dba3dc36c41467835d60233b508 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 28 Aug 2019 00:06:45 +0100 Subject: [PATCH] swr: replace major llvm version checks with LLVM_VERSION_MAJOR MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Acked-by: Michel Dänzer --- src/gallium/drivers/swr/swr_shader.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp index 5ef45caecc3..2a73095ec49 100644 --- a/src/gallium/drivers/swr/swr_shader.cpp +++ b/src/gallium/drivers/swr/swr_shader.cpp @@ -25,6 +25,7 @@ #pragma push_macro("DEBUG") #undef DEBUG #include "JitManager.h" +#include #include "llvm-c/Core.h" #include "llvm/Support/CBindingWrapping.h" #include "llvm/IR/LegacyPassManager.h" @@ -599,7 +600,7 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key) GlobalValue::ExternalLinkage, "GS", JM()->mpCurrentModule); -#if HAVE_LLVM < 0x0500 +#if LLVM_VERSION_MAJOR < 5 AttributeSet attrSet = AttributeSet::get( JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); @@ -773,7 +774,7 @@ BuilderSWR::CompileVS(struct swr_context *ctx, swr_jit_vs_key &key) GlobalValue::ExternalLinkage, "VS", JM()->mpCurrentModule); -#if HAVE_LLVM < 0x0500 +#if LLVM_VERSION_MAJOR < 5 AttributeSet attrSet = AttributeSet::get( JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); @@ -1059,7 +1060,7 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key) GlobalValue::ExternalLinkage, "FS", JM()->mpCurrentModule); -#if HAVE_LLVM < 0x0500 +#if LLVM_VERSION_MAJOR < 5 AttributeSet attrSet = AttributeSet::get( JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); -- 2.30.2