diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f0f39e9aa..e5c160a4f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5270,20 +5270,31 @@ static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op, } } -static void sm6_parser_emit_dx_binary(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, +static void sm6_parser_emit_dx_binary(struct sm6_parser *dxil, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { - struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_instruction *ins; struct vsir_src_operand *src_params; uint32_t type_flags; - vsir_instruction_init(ins, &sm6->p.location, map_dx_binary_op(op, operands[0]->type, &type_flags)); - if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + if (!(ins = sm6_parser_add_function_instruction(dxil, state))) return; - src_param_init_from_value(&src_params[0], operands[0], type_flags, sm6); - src_param_init_from_value(&src_params[1], operands[1], type_flags, sm6); - instruction_dst_param_init_ssa_scalar(ins, type_flags, sm6); + state->pushed_instruction = true; + + vsir_instruction_init(ins, &dxil->p.location, map_dx_binary_op(op, operands[0]->type, &type_flags)); + + if (!(src_params = instruction_src_params_alloc(ins, 2, dxil))) + { + vkd3d_shader_instruction_make_nop(ins); + return; + } + + src_param_init_from_value(&src_params[0], operands[0], type_flags, dxil); + src_param_init_from_value(&src_params[1], operands[1], type_flags, dxil); + + if (!instruction_dst_param_init_ssa_scalar(ins, type_flags, dxil)) + vkd3d_shader_instruction_make_nop(ins); } static enum vkd3d_shader_opcode map_dx_atomic_binop(const struct sm6_value *operand, struct sm6_parser *sm6)