fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

llvmpipe: replace more complex 3.x version check with LLVM_VERSION_MAJOR/MINOR

Browse source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Eric Engestrom 2019-08-28 00:36:37 +01:00
parent ba1e085587
commit 2406b35151
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/llvmpipe/lp_jit.c
View file

@ -32,6 +32,7 @@
* @author Jose Fonseca <jfonseca@vmware.com> * @author Jose Fonseca <jfonseca@vmware.com>
*/ */
#include <llvm/Config/llvm-config.h>
#include "util/u_memory.h" #include "util/u_memory.h"
#include "gallivm/lp_bld_init.h" #include "gallivm/lp_bld_init.h"
@ -285,7 +286,7 @@ lp_jit_create_types(struct lp_fragment_shader_variant *lp)
} }
if (gallivm_debug & GALLIVM_DEBUG_IR) { if (gallivm_debug & GALLIVM_DEBUG_IR) {
#if HAVE_LLVM >= 0x304 #if (LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 4))
char *str = LLVMPrintModuleToString(gallivm->module); char *str = LLVMPrintModuleToString(gallivm->module);
fprintf(stderr, "%s", str); fprintf(stderr, "%s", str);
LLVMDisposeMessage(str); LLVMDisposeMessage(str);
@ -399,7 +400,7 @@ lp_jit_create_cs_types(struct lp_compute_shader_variant *lp)
} }
if (gallivm_debug & GALLIVM_DEBUG_IR) { if (gallivm_debug & GALLIVM_DEBUG_IR) {
#if HAVE_LLVM >= 0x304 #if (LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 4))
char *str = LLVMPrintModuleToString(gallivm->module); char *str = LLVMPrintModuleToString(gallivm->module);
fprintf(stderr, "%s", str); fprintf(stderr, "%s", str);
LLVMDisposeMessage(str); LLVMDisposeMessage(str);