From 3406a57ff3ff21f0be29a6f8396cc5d69f7581ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 23 Jul 2019 20:41:30 -0400 Subject: [PATCH] radeonsi: don't use lp_build_alloca --- src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.c | 1 - src/gallium/drivers/radeonsi/si_shader.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c index f5c41cd07a4..4f814f7a05b 100644 --- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c +++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c @@ -1137,7 +1137,7 @@ void gfx10_ngg_gs_emit_epilogue(struct si_shader_context *ctx) /* TODO: culling */ /* Determine vertex liveness. */ - LLVMValueRef vertliveptr = lp_build_alloca(&ctx->gallivm, ctx->ac.i1, "vertexlive"); + LLVMValueRef vertliveptr = ac_build_alloca(&ctx->ac, ctx->ac.i1, "vertexlive"); tmp = LLVMBuildICmp(builder, LLVMIntULT, tid, num_emit_threads, ""); ac_build_ifcc(&ctx->ac, tmp, 5120); diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 5a7c9a0d4a7..74d58d4993c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -31,7 +31,6 @@ #include "ac_llvm_util.h" #include "radeon/radeon_uvd.h" -#include "gallivm/lp_bld_misc.h" #include "util/disk_cache.h" #include "util/u_log.h" #include "util/u_memory.h" diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 650195b01bf..cdec72077d1 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -6151,9 +6151,9 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx) if (shader->key.as_ngg) { for (unsigned i = 0; i < 4; ++i) { ctx->gs_curprim_verts[i] = - lp_build_alloca(&ctx->gallivm, ctx->ac.i32, ""); + ac_build_alloca(&ctx->ac, ctx->ac.i32, ""); ctx->gs_generated_prims[i] = - lp_build_alloca(&ctx->gallivm, ctx->ac.i32, ""); + ac_build_alloca(&ctx->ac, ctx->ac.i32, ""); } unsigned scratch_size = 8; -- 2.30.2