Mesa (master): st/mesa: disable the shader cache if dumping shaders

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Mar 10 12:19:50 2017 +0100

st/mesa: disable the shader cache if dumping shaders

otherwise, cached shaders aren't dumped.

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/mesa/state_tracker/st_context.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 5855258..a528f34 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -330,9 +330,6 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe,
    st->ctx = ctx;
    st->pipe = pipe;
 
-   /* XXX: this is one-off, per-screen init: */
-   st_debug_init();
-   
    /* state tracker needs the VBO module */
    _vbo_CreateContext(ctx);
 
@@ -536,7 +533,10 @@ struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
       return NULL;
    }
 
-   if (pipe->screen->get_disk_shader_cache)
+   st_debug_init();
+
+   if (pipe->screen->get_disk_shader_cache &&
+       !(ST_DEBUG & DEBUG_TGSI))
       ctx->Cache = pipe->screen->get_disk_shader_cache(pipe->screen);
 
    st_init_driver_flags(&ctx->DriverFlags);