[Mesa-stable] [Mesa-dev] [PATCH 3/3] radeon/llvm: Initialize gallivm targets when initializing the AMDGPU target v2

[Marek Olšák]

For the series:

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Wed, Sep 30, 2015 at 8:59 PM, Tom Stellard <thomas.stellard at amd.com> wrote:
> This fixes a race condition in the glx-multithreaded-shader-compile
> test.
>
> v2:
>   - Replace gallivm_init_llvm_{begin,end}() with gallivm_init_llvm_targets().
>
> CC: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/radeon/radeon_llvm_emit.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c
> index 5d93a4d..1a66a55 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();
> --
> 2.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev