radeonsi: reorder code in si_llvm_context_init
authorMarek Olšák <marek.olsak@amd.com>
Wed, 4 Jul 2018 05:35:10 +0000 (01:35 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Wed, 4 Jul 2018 19:48:18 +0000 (15:48 -0400)
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c

index 6c1e18ff812cb8923da54fdbf3bb7189cb3f6188..b8cfd15a67f8fbd7cd4baa8bfb21d923ad2c76d2 100644 (file)
@@ -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;