From e1df0d45c4dc76922b240e7b43deb0e173b78f1e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Wed, 15 Jan 2014 12:31:07 +0900 Subject: [PATCH] radeonsi: Really dump TGSI code before any TGSI->LLVM conversion attempt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit While we're at it, use the local variable 'sel'. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 7718e919555..c9001a0ec10 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2421,7 +2421,14 @@ int si_pipe_shader_create( struct lp_build_tgsi_context * bld_base; LLVMModuleRef mod; int r = 0; - bool dump = r600_can_dump_shader(&sctx->screen->b, shader->selector->tokens); + bool dump = r600_can_dump_shader(&sctx->screen->b, sel->tokens); + + /* Dump TGSI code before doing TGSI->LLVM conversion in case the + * conversion fails. */ + if (dump) { + tgsi_dump(sel->tokens, 0); + si_dump_streamout(&sel->so); + } assert(shader->shader.noutput == 0); assert(shader->shader.nparam == 0); @@ -2509,13 +2516,6 @@ int si_pipe_shader_create( preload_samplers(&si_shader_ctx); preload_streamout_buffers(&si_shader_ctx); - /* Dump TGSI code before doing TGSI->LLVM conversion in case the - * conversion fails. */ - if (dump) { - tgsi_dump(sel->tokens, 0); - si_dump_streamout(&sel->so); - } - if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) { si_shader_ctx.gs_next_vertex = lp_build_alloca(bld_base->base.gallivm, -- 2.30.2