radeonsi: don't use lp_build_alloca

diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
index f5c41cd07a47c05d037997a260c9513e29d7d264..4f814f7a05be14eb9d7b75c7f9cc09c6734f1ed3 100644 (file)
--- 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 5a7c9a0d4a7ed7bdf43e12882a6249ae7e0c7d58..74d58d4993c65eaf25ff1f89cb2750b1641a17ec 100644 (file)
--- 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 650195b01bfd1b9dfda1dcfeea70a10c84df8153..cdec72077d12e366f29ba7db2d7b43e66afda6c6 100644 (file)
--- 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;