From 21ba8a204eb654c71895d285e92fcea2343a98dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 21 Jun 2018 18:52:21 -0400 Subject: [PATCH] radeonsi: use gallivm less Reviewed-by: Timothy Arceri --- src/gallium/drivers/radeonsi/si_shader.c | 4 ++-- src/gallium/drivers/radeonsi/si_shader_nir.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 8680b4e35d1..133cb556ae7 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -5847,7 +5847,7 @@ si_generate_gs_copy_shader(struct si_screen *sscreen, r = si_compile_llvm(sscreen, &ctx.shader->binary, &ctx.shader->config, ctx.compiler, - ctx.gallivm.module, + ctx.ac.module, debug, PIPE_SHADER_GEOMETRY, "GS Copy Shader"); if (!r) { @@ -6982,7 +6982,7 @@ int si_compile_tgsi_shader(struct si_screen *sscreen, /* Compile to bytecode. */ r = si_compile_llvm(sscreen, &shader->binary, &shader->config, compiler, - ctx.gallivm.module, debug, ctx.type, "TGSI shader"); + ctx.ac.module, debug, ctx.type, "TGSI shader"); si_llvm_dispose(&ctx); if (r) { fprintf(stderr, "LLVM failed to compile shader\n"); diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index c46d0ab5a82..d7e8ccd3047 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -920,7 +920,7 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi, if (dynamic_index) index = si_llvm_bound_index(ctx, index, ctx->num_images); - index = LLVMBuildSub(ctx->gallivm.builder, + index = LLVMBuildSub(ctx->ac.builder, LLVMConstInt(ctx->i32, SI_NUM_IMAGES - 1, 0), index, ""); @@ -933,7 +933,7 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi, if (dynamic_index) index = si_llvm_bound_index(ctx, index, ctx->num_samplers); - index = LLVMBuildAdd(ctx->gallivm.builder, index, + index = LLVMBuildAdd(ctx->ac.builder, index, LLVMConstInt(ctx->i32, SI_NUM_IMAGES / 2, 0), ""); return si_load_sampler_desc(ctx, list, index, desc_type); -- 2.30.2