summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2015-09-24 16:29:56 +0000
committerTom Stellard <thomas.stellard@amd.com>2015-10-02 23:41:27 +0000
commita2e1e3d325a70604151ef093ed741e60d078a21a (patch)
treef2aff2be6ea0611615dc01871891221ac1726607
parent76cfd6f1da3748effb480e4f1151910af59fb88a (diff)
downloadexternal_mesa3d-a2e1e3d325a70604151ef093ed741e60d078a21a.zip
external_mesa3d-a2e1e3d325a70604151ef093ed741e60d078a21a.tar.gz
external_mesa3d-a2e1e3d325a70604151ef093ed741e60d078a21a.tar.bz2
radeon/llvm: Initialize gallivm targets when initializing the AMDGPU target v2
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 <marek.olsak@amd.com> Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> CC: "10.6 11.0" <mesa-stable@lists.freedesktop.org>
-rw-r--r--src/gallium/drivers/radeon/radeon_llvm_emit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c
index ff30a14..6b2ebde 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();