From 00425de65779ad3a61639287088ea5eaaf567cb6 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 24 Sep 2015 16:29:56 +0000 Subject: radeon/llvm: Initialize gallivm targets when initializing the AMDGPU target v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a race condition in the glx-multithreaded-shader-compile test. v2: - Replace gallivm_init_llvm_{begin,end}() with gallivm_init_llvm_targets(). Reviewed-by: Marek Olšák Reviewed-by: Mathias Fröhlich Reviewed-by: Emil Velikov CC: "10.6 11.0" (cherry picked from commit a2e1e3d325a70604151ef093ed741e60d078a21a) --- src/gallium/drivers/radeon/radeon_llvm_emit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c index 5d93a4dd7b4..1a66a55ee03 100644 --- a/src/gallium/drivers/radeon/radeon_llvm_emit.c +++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c @@ -26,6 +26,7 @@ #include "radeon_llvm_emit.h" #include "radeon_elf_util.h" #include "c11/threads.h" +#include "gallivm/lp_bld_misc.h" #include "util/u_memory.h" #include "pipe/p_shader_tokens.h" @@ -87,6 +88,7 @@ void radeon_llvm_shader_type(LLVMValueRef F, unsigned type) static void init_r600_target() { + gallivm_init_llvm_targets(); #if HAVE_LLVM < 0x0307 LLVMInitializeR600TargetInfo(); LLVMInitializeR600Target(); -- cgit v1.2.3