From f5cb4194c904ad510956d20fd8be90e0c56f47a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 4 Jul 2018 01:35:10 -0400 Subject: [PATCH] radeonsi: reorder code in si_llvm_context_init Reviewed-by: Dave Airlie --- .../drivers/radeonsi/si_shader_tgsi_setup.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c index 6c1e18ff812..b8cfd15a67f 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c @@ -956,21 +956,21 @@ void si_llvm_context_init(struct si_shader_context *ctx, ctx->screen = sscreen; ctx->compiler = compiler; - ctx->gallivm.context = LLVMContextCreate(); - ctx->gallivm.module = ac_create_module(compiler->tm, ctx->gallivm.context); - - bool unsafe_fpmath = (sscreen->debug_flags & DBG(UNSAFE_MATH)) != 0; - enum ac_float_mode float_mode = - unsafe_fpmath ? AC_FLOAT_MODE_UNSAFE_FP_MATH : - AC_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH; + ctx->ac.context = LLVMContextCreate(); + ac_llvm_context_init(&ctx->ac, ctx->ac.context, + sscreen->info.chip_class, sscreen->info.family); - ctx->gallivm.builder = ac_create_builder(ctx->gallivm.context, - float_mode); + ctx->ac.module = ac_create_module(compiler->tm, ctx->ac.context); - ac_llvm_context_init(&ctx->ac, ctx->gallivm.context, - sscreen->info.chip_class, sscreen->info.family); - ctx->ac.module = ctx->gallivm.module; - ctx->ac.builder = ctx->gallivm.builder; + enum ac_float_mode float_mode = + sscreen->debug_flags & DBG(UNSAFE_MATH) ? + AC_FLOAT_MODE_UNSAFE_FP_MATH : + AC_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH; + ctx->ac.builder = ac_create_builder(ctx->ac.context, float_mode); + + ctx->gallivm.context = ctx->ac.context; + ctx->gallivm.module = ctx->ac.module; + ctx->gallivm.builder = ctx->ac.builder; struct lp_build_tgsi_context *bld_base = &ctx->bld_base; -- 2.30.2