Module: Mesa Branch: main Commit: 9db67311cf483f7c204e2152ee05e4f14e4b2f8b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9db67311cf483f7c204e2152ee05e4f14e4b2f8b
Author: Qiang Yu <[email protected]> Date: Tue Sep 12 10:25:57 2023 +0800 radeonsi: does not call llvm init when no llvm available It's still needed when aco asm print. Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: Qiang Yu <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25632> --- src/gallium/drivers/radeonsi/si_pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 48431df1eab..af27ab1450c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1545,6 +1545,7 @@ struct pipe_screen *radeonsi_screen_create(int fd, const struct pipe_screen_conf if (!version) return NULL; +#ifdef LLVM_AVAILABLE /* LLVM must be initialized before util_queue because both u_queue and LLVM call atexit, * and LLVM must call it first because its atexit handler executes C++ destructors, * which must be done after our compiler threads using LLVM in u_queue are finished @@ -1552,6 +1553,7 @@ struct pipe_screen *radeonsi_screen_create(int fd, const struct pipe_screen_conf * LLVM must be initialized first, followed by u_queue. */ ac_init_llvm_once(); +#endif driParseConfigFiles(config->options, config->options_info, 0, "radeonsi", NULL, NULL, NULL, 0, NULL, 0);
