Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>master
| @@ -961,7 +961,7 @@ st_create_context(gl_api api, struct pipe_context *pipe, | |||
| st_debug_init(); | |||
| if (pipe->screen->get_disk_shader_cache && | |||
| !(ST_DEBUG & DEBUG_TGSI)) | |||
| !(ST_DEBUG & DEBUG_PRINT_IR)) | |||
| ctx->Cache = pipe->screen->get_disk_shader_cache(pipe->screen); | |||
| /* XXX: need a capability bit in gallium to query if the pipe | |||
| @@ -46,7 +46,7 @@ int ST_DEBUG = 0; | |||
| static const struct debug_named_value st_debug_flags[] = { | |||
| { "mesa", DEBUG_MESA, NULL }, | |||
| { "tgsi", DEBUG_TGSI, NULL }, | |||
| { "tgsi", DEBUG_PRINT_IR, NULL }, | |||
| { "constants",DEBUG_CONSTANTS, NULL }, | |||
| { "pipe", DEBUG_PIPE, NULL }, | |||
| { "tex", DEBUG_TEX, NULL }, | |||
| @@ -39,7 +39,7 @@ st_print_current(void); | |||
| #define DEBUG_MESA 0x1 | |||
| #define DEBUG_TGSI 0x2 | |||
| #define DEBUG_PRINT_IR 0x2 | |||
| #define DEBUG_CONSTANTS 0x4 | |||
| #define DEBUG_PIPE 0x8 | |||
| #define DEBUG_TEX 0x10 | |||
| @@ -791,7 +791,7 @@ st_create_vp_variant(struct st_context *st, | |||
| state.tokens = tokens; | |||
| } | |||
| if (ST_DEBUG & DEBUG_TGSI) { | |||
| if (ST_DEBUG & DEBUG_PRINT_IR) { | |||
| tgsi_dump(state.tokens, 0); | |||
| debug_printf("\n"); | |||
| } | |||
| @@ -1489,7 +1489,7 @@ st_create_fp_variant(struct st_context *st, | |||
| state.tokens = tokens; | |||
| } | |||
| if (ST_DEBUG & DEBUG_TGSI) { | |||
| if (ST_DEBUG & DEBUG_PRINT_IR) { | |||
| tgsi_dump(state.tokens, 0); | |||
| debug_printf("\n"); | |||
| } | |||
| @@ -1729,12 +1729,12 @@ st_translate_common_program(struct st_context *st, | |||
| st_store_ir_in_disk_cache(st, prog, false); | |||
| if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) { | |||
| if ((ST_DEBUG & DEBUG_PRINT_IR) && (ST_DEBUG & DEBUG_MESA)) { | |||
| _mesa_print_program(prog); | |||
| debug_printf("\n"); | |||
| } | |||
| if (ST_DEBUG & DEBUG_TGSI) { | |||
| if (ST_DEBUG & DEBUG_PRINT_IR) { | |||
| tgsi_dump(stcp->state.tokens, 0); | |||
| debug_printf("\n"); | |||
| } | |||