From 64e2b5617764a51d991de09ac7686b969192528a Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Thu, 6 Feb 2025 18:07:15 -0800 Subject: [PATCH] shader_recompiler: Use initializer_list for bitfield insert helper. --- .../spirv/emit_spirv_bitwise_conversion.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_bitwise_conversion.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_bitwise_conversion.cpp index 399280b79..56a6abc05 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_bitwise_conversion.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_bitwise_conversion.cpp @@ -28,17 +28,19 @@ static std::array ExtractBitFields(EmitContext& ctx, const } template -static Id InsertBitFields(EmitContext& ctx, const std::vector& values, const Args... args) { +static Id InsertBitFields(EmitContext& ctx, const std::initializer_list values, + const Args... args) { Id result{}; - u32 i = 0; + auto it = values.begin(); ( [&] { - if (i == 0) { - result = values[i++]; + if (it == values.begin()) { + result = *it; } else { - result = ctx.OpBitFieldInsert(ctx.U32[1], result, values[i++], - ctx.ConstU32(args.offset), ctx.ConstU32(args.size)); + result = ctx.OpBitFieldInsert(ctx.U32[1], result, *it, ctx.ConstU32(args.offset), + ctx.ConstU32(args.size)); } + ++it; }(), ...); return result;