r600: Make sure LLVM is not used for DRAW
authorGert Wollny <gert.wollny@collabora.com>
Fri, 27 Dec 2019 20:24:11 +0000 (21:24 +0100)
committerMarge Bot <eric+marge@anholt.net>
Mon, 10 Feb 2020 19:09:08 +0000 (19:09 +0000)
For some reasone that is not yet clear the piglit
gl-1.0-rendermode-feedback makes use of the LLVM pipe draw module and
fails there with an assertion. Explicietly disabling LLVM fixes this.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3225>

src/gallium/drivers/r600/r600_pipe_common.c

index 13544826d0b2acd29fc5287404740a2c99420f8f..e7942c92c0c9832eefd56b356e28b33cd5d0743a 100644 (file)
@@ -39,6 +39,7 @@
 #include "radeon_video.h"
 #include <inttypes.h>
 #include <sys/utsname.h>
+#include <stdlib.h>
 
 #ifdef LLVM_AVAILABLE
 #include <llvm-c/TargetMachine.h>
@@ -1260,6 +1261,10 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
        rscreen->family = rscreen->info.family;
        rscreen->chip_class = rscreen->info.chip_class;
        rscreen->debug_flags |= debug_get_flags_option("R600_DEBUG", common_debug_options, 0);
+       int has_draw_use_llvm = debug_get_bool_option("DRAW_USE_LLVM", FALSE);
+       if (!has_draw_use_llvm)
+          setenv("DRAW_USE_LLVM", "no", 0);
+
 
        r600_disk_cache_create(rscreen);