diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 2bf869ef6..aaf1bf452 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -8517,9 +8517,9 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro * * neg sr0, vFOG.x * add sr1, FOG_END, sr0 - * mul_sat srFACTOR, sr1, FOG_SCALE + * mul srFACTOR, sr1, FOG_SCALE */ - if (!(ins = vsir_program_iterator_insert_before_and_move(it, 6))) + if (!(ins = vsir_program_iterator_insert_before_and_move(it, 7))) return VKD3D_ERROR_OUT_OF_MEMORY; ssa_temp = program->ssa_count++; @@ -8541,7 +8541,6 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_MUL, 1, 2); dst_param_init_ssa_float(&ins->dst[0], ssa_factor); - ins->dst[0].modifiers = VKD3DSPDM_SATURATE; src_param_init_ssa_float(&ins->src[0], ssa_temp2); src_param_init_parameter(&ins->src[1], VKD3D_SHADER_PARAMETER_NAME_FOG_SCALE, VSIR_DATA_F32); ins = vsir_program_iterator_next(it); @@ -8553,9 +8552,9 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro * * mul sr0, FOG_SCALE, vFOG.x * neg sr1, sr0 - * exp_sat srFACTOR, sr1 + * exp srFACTOR, sr1 */ - if (!(ins = vsir_program_iterator_insert_before_and_move(it, 6))) + if (!(ins = vsir_program_iterator_insert_before_and_move(it, 7))) return VKD3D_ERROR_OUT_OF_MEMORY; ssa_temp = program->ssa_count++; @@ -8577,7 +8576,6 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_EXP, 1, 1); dst_param_init_ssa_float(&ins->dst[0], ssa_factor); - ins->dst[0].modifiers = VKD3DSPDM_SATURATE; src_param_init_ssa_float(&ins->src[0], ssa_temp2); ins = vsir_program_iterator_next(it); break; @@ -8588,9 +8586,9 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro * mul sr0, FOG_SCALE, vFOG.x * mul sr1, sr0, sr0 * neg sr2, sr1 - * exp_sat srFACTOR, sr2 + * exp srFACTOR, sr2 */ - if (!(ins = vsir_program_iterator_insert_before_and_move(it, 7))) + if (!(ins = vsir_program_iterator_insert_before_and_move(it, 8))) return VKD3D_ERROR_OUT_OF_MEMORY; ssa_temp = program->ssa_count++; @@ -8619,7 +8617,6 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_EXP, 1, 1); dst_param_init_ssa_float(&ins->dst[0], ssa_factor); - ins->dst[0].modifiers = VKD3DSPDM_SATURATE; src_param_init_ssa_float(&ins->src[0], ssa_temp3); ins = vsir_program_iterator_next(it); break; @@ -8632,10 +8629,12 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro * * neg sr0, FOG_COLOUR * add sr1, FRAG_COLOUR, sr0 - * mad oC0, sr1, srFACTOR, FOG_COLOUR + * saturate sr2, srFACTOR + * mad oC0, sr1, sr2, FOG_COLOUR */ ssa_temp = program->ssa_count++; ssa_temp2 = program->ssa_count++; + ssa_temp3 = program->ssa_count++; vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_NEG, 1, 1); dst_param_init_ssa_float4(&ins->dst[0], ssa_temp); @@ -8648,11 +8647,16 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro src_param_init_ssa_float4(&ins->src[1], ssa_temp); ins = vsir_program_iterator_next(it); + vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_SATURATE, 1, 1); + dst_param_init_ssa_float(&ins->dst[0], ssa_temp3); + src_param_init_ssa_float(&ins->src[0], ssa_factor); + ins = vsir_program_iterator_next(it); + vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_MAD, 1, 3); dst_param_init_output(&ins->dst[0], VSIR_DATA_F32, colour_signature_idx, program->output_signature.elements[colour_signature_idx].mask); src_param_init_ssa_float4(&ins->src[0], ssa_temp2); - src_param_init_ssa_float(&ins->src[1], ssa_factor); + src_param_init_ssa_float(&ins->src[1], ssa_temp3); src_param_init_parameter_vec4(&ins->src[2], VKD3D_SHADER_PARAMETER_NAME_FOG_COLOUR, VSIR_DATA_F32); ins = vsir_program_iterator_next(it);