From 265abc54f828750ffde075d6faf71541ca58ad42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 8 Nov 2019 19:35:02 -0500 Subject: [PATCH] st/mesa: print TCS/TES/GS/CS TGSI in the right place & keep disk cache enabled The old place only printed on a disk cache miss, which is why the disk cache was disabled. Reviewed-by: Timothy Arceri --- src/mesa/state_tracker/st_context.c | 3 +-- src/mesa/state_tracker/st_program.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 0a473f2d327..817a75da780 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -960,8 +960,7 @@ st_create_context(gl_api api, struct pipe_context *pipe, st_debug_init(); - if (pipe->screen->get_disk_shader_cache && - !(ST_DEBUG & DEBUG_PRINT_IR)) + if (pipe->screen->get_disk_shader_cache) ctx->Cache = pipe->screen->get_disk_shader_cache(pipe->screen); /* XXX: need a capability bit in gallium to query if the pipe diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index c37799a2ff4..41508710783 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1728,9 +1728,6 @@ st_translate_common_program(struct st_context *st, if (ST_DEBUG & DEBUG_PRINT_IR && ST_DEBUG & DEBUG_MESA) _mesa_print_program(prog); - if (ST_DEBUG & DEBUG_PRINT_IR) - tgsi_dump(stcp->state.tokens, 0); - free_glsl_to_tgsi_visitor(stcp->glsl_to_tgsi); stcp->glsl_to_tgsi = NULL; return true; @@ -1795,7 +1792,10 @@ st_get_common_variant(struct st_context *st, prog->state.tokens = tokens; } - state = prog->state; + state = prog->state; + + if (ST_DEBUG & DEBUG_PRINT_IR) + tgsi_dump(state.tokens, 0); } /* fill in new variant */ switch (prog->Base.info.stage) { -- 2.30.2