From 54c46db1c88df9042b0cf8dafc0046ecd445359c Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 19 Jul 2019 15:30:54 +0200 Subject: [PATCH] zink/spirv: implement emit_float_const helper Acked-by: Jordan Justen --- .../drivers/zink/nir_to_spirv/nir_to_spirv.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index 94ee6158eca..6910bb49b3e 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -664,6 +664,13 @@ emit_builtin_binop(struct ntv_context *ctx, enum GLSLstd450 op, SpvId type, op, args, ARRAY_SIZE(args)); } +static SpvId +emit_float_const(struct ntv_context *ctx, int bit_size, float value) +{ + assert(bit_size == 32); + return spirv_builder_const_float(&ctx->builder, bit_size, value); +} + static SpvId get_fvec_constant(struct ntv_context *ctx, int bit_size, int num_components, const float values[]) @@ -673,8 +680,7 @@ get_fvec_constant(struct ntv_context *ctx, int bit_size, int num_components, if (num_components > 1) { SpvId components[num_components]; for (int i = 0; i < num_components; i++) - components[i] = spirv_builder_const_float(&ctx->builder, bit_size, - values[i]); + components[i] = emit_float_const(ctx, bit_size, values[i]); SpvId type = get_fvec_type(ctx, bit_size, num_components); return spirv_builder_const_composite(&ctx->builder, type, components, @@ -682,7 +688,7 @@ get_fvec_constant(struct ntv_context *ctx, int bit_size, int num_components, } assert(num_components == 1); - return spirv_builder_const_float(&ctx->builder, bit_size, values[0]); + return emit_float_const(ctx, bit_size, values[0]); } static SpvId @@ -913,8 +919,8 @@ emit_alu(struct ntv_context *ctx, nir_alu_instr *alu) int num_components = nir_dest_num_components(alu->dest.dest); SpvId bool_type = get_bvec_type(ctx, num_components); - SpvId zero = spirv_builder_const_float(&ctx->builder, 32, 0.0f); - SpvId one = spirv_builder_const_float(&ctx->builder, 32, 1.0f); + SpvId zero = emit_float_const(ctx, 32, 0.0f); + SpvId one = emit_float_const(ctx, 32, 1.0f); if (num_components > 1) { SpvId zero_comps[num_components], one_comps[num_components]; for (int i = 0; i < num_components; i++) { @@ -1181,7 +1187,7 @@ emit_tex(struct ntv_context *ctx, nir_tex_instr *tex) } if (lod == 0 && ctx->stage != MESA_SHADER_FRAGMENT) { - lod = spirv_builder_const_float(&ctx->builder, 32, 0); + lod = emit_float_const(ctx, 32, 0.0f); assert(lod != 0); } -- 2.30.2