summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGert Wollny <gert.wollny@collabora.com>2019-12-27 21:24:11 +0100
committerMarge Bot <eric+marge@anholt.net>2020-02-10 19:09:08 +0000
commit90a7d2e08fbd94d443fe6aeed093e4c758b169da (patch)
treefabf0c51235ed020e99dc435701c3aa8922dd0d5
parent37125b7cc220fd9b77e9882268892ca4e79a0627 (diff)
r600: Make sure LLVM is not used for DRAW
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>
-rw-r--r--src/gallium/drivers/r600/r600_pipe_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index 13544826d0b..e7942c92c0c 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -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);