diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c index af6034f668b..d11d924b6fc 100644 --- a/src/amd/llvm/ac_llvm_build.c +++ b/src/amd/llvm/ac_llvm_build.c @@ -38,15 +38,13 @@ struct ac_llvm_flow { */ void ac_llvm_context_init(struct ac_llvm_context *ctx, struct ac_llvm_compiler *compiler, const struct radeon_info *info, enum ac_float_mode float_mode, - unsigned wave_size, unsigned ballot_mask_bits, bool exports_color_null, - bool exports_mrtz) + unsigned wave_size, bool exports_color_null, bool exports_mrtz) { ctx->context = LLVMContextCreate(); ctx->info = info; ctx->gfx_level = info->gfx_level; ctx->wave_size = wave_size; - ctx->ballot_mask_bits = ballot_mask_bits; ctx->float_mode = float_mode; ctx->exports_color_null = exports_color_null; ctx->exports_mrtz = exports_mrtz; @@ -79,7 +77,6 @@ void ac_llvm_context_init(struct ac_llvm_context *ctx, struct ac_llvm_compiler * ctx->v4f32 = LLVMVectorType(ctx->f32, 4); ctx->v8i32 = LLVMVectorType(ctx->i32, 8); ctx->iN_wavemask = LLVMIntTypeInContext(ctx->context, ctx->wave_size); - ctx->iN_ballotmask = LLVMIntTypeInContext(ctx->context, ballot_mask_bits); ctx->i8_0 = LLVMConstInt(ctx->i8, 0, false); ctx->i8_1 = LLVMConstInt(ctx->i8, 1, false); diff --git a/src/amd/llvm/ac_llvm_build.h b/src/amd/llvm/ac_llvm_build.h index 3926fa50c02..c337ffad882 100644 --- a/src/amd/llvm/ac_llvm_build.h +++ b/src/amd/llvm/ac_llvm_build.h @@ -97,7 +97,6 @@ struct ac_llvm_context { LLVMTypeRef v4f32; LLVMTypeRef v8i32; LLVMTypeRef iN_wavemask; - LLVMTypeRef iN_ballotmask; LLVMValueRef i8_0; LLVMValueRef i8_1; @@ -135,7 +134,6 @@ struct ac_llvm_context { enum amd_gfx_level gfx_level; unsigned wave_size; - unsigned ballot_mask_bits; unsigned float_mode; @@ -148,8 +146,7 @@ struct ac_llvm_context { void ac_llvm_context_init(struct ac_llvm_context *ctx, struct ac_llvm_compiler *compiler, const struct radeon_info *info, enum ac_float_mode float_mode, - unsigned wave_size, unsigned ballot_mask_bits, bool exports_color_null, - bool exports_mrtz); + unsigned wave_size, bool exports_color_null, bool exports_mrtz); void ac_llvm_context_dispose(struct ac_llvm_context *ctx); diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index 1d63ed68b9d..e899df6ff19 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -206,8 +206,7 @@ ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm, const struct radv_nir exports_color_null = !exports_mrtz || (shaders[0]->info.outputs_written & (0xffu << FRAG_RESULT_DATA0)); } - ac_llvm_context_init(&ctx.ac, ac_llvm, options->info, float_mode, info->wave_size, info->ballot_bit_size, - exports_color_null, exports_mrtz); + ac_llvm_context_init(&ctx.ac, ac_llvm, options->info, float_mode, info->wave_size, exports_color_null, exports_mrtz); uint32_t length = 1; for (uint32_t i = 0; i < shader_count; i++) diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c index 9ff79c4c89b..a08876baf2d 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c @@ -117,7 +117,7 @@ static void si_llvm_context_init(struct si_shader_context *ctx, struct si_screen ctx->compiler = compiler; ac_llvm_context_init(&ctx->ac, compiler, &sscreen->info, float_mode, - wave_size, 64, exports_color_null, exports_mrtz); + wave_size, exports_color_null, exports_mrtz); } void si_llvm_create_func(struct si_shader_context *ctx, const char *name, LLVMTypeRef *return_types,