Mesa (main): nine: only enable tgsi disk cache if the driver supports it

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 18 17:43:09 UTC 2021


Module: Mesa
Branch: main
Commit: f91ffe13490e33ad4e8e8c280297f0f56c0f6e6a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f91ffe13490e33ad4e8e8c280297f0f56c0f6e6a

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jun 18 12:56:43 2021 -0400

nine: only enable tgsi disk cache if the driver supports it

this crashes otherwise

Reviewed-by: Axel Davy <davyaxel0 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11471>

---

 src/gallium/frontends/nine/nine_shader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/frontends/nine/nine_shader.c b/src/gallium/frontends/nine/nine_shader.c
index b365362cfed..6e1d470b404 100644
--- a/src/gallium/frontends/nine/nine_shader.c
+++ b/src/gallium/frontends/nine/nine_shader.c
@@ -3866,7 +3866,7 @@ static void
 nine_pipe_nir_shader_state_from_tgsi(struct pipe_shader_state *state, const struct tgsi_token *tgsi_tokens,
                                      struct pipe_screen *screen)
 {
-    struct nir_shader *nir = tgsi_to_nir(tgsi_tokens, screen, true);
+    struct nir_shader *nir = tgsi_to_nir(tgsi_tokens, screen, screen->get_disk_shader_cache != NULL);
 
     if (unlikely(nine_shader_get_debug_flag(NINE_SHADER_DEBUG_OPTION_DUMP_NIR))) {
         nir_print_shader(nir, stdout);



More information about the mesa-commit mailing list