Mesa (master): radeonsi: copy the NIR enablement debug bit to the shader cache flags

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 12fd567c78c66b136b5c67782be754790951a560
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12fd567c78c66b136b5c67782be754790951a560

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Feb  9 01:47:26 2018 +0100

radeonsi: copy the NIR enablement debug bit to the shader cache flags

When NIR is enabled, TGSI must not be used. When NIR is disabled, TGSI

Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/gallium/drivers/radeonsi/si_pipe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 26835d673d..97f11ea687 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -642,7 +642,8 @@ static void si_disk_cache_create(struct si_screen *sscreen)
 				sscreen->debug_flags &
 				(DBG(FS_CORRECT_DERIVS_AFTER_KILL) |
 				 DBG(SI_SCHED) |
-				 DBG(UNSAFE_MATH));
+				 DBG(UNSAFE_MATH) |
+				 DBG(NIR));
 
 			sscreen->disk_shader_cache =
 				disk_cache_create(si_get_family_name(sscreen),