wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Use VSIR_OP_SATURATE in insert_fragment_fog_before_ret().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-16 14:05:12 +02:00
committed by Henri Verbeet
parent d503fbfd79
commit b41e99c036
Notes: Henri Verbeet 2025-10-27 19:10:19 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1798
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libs/vkd3d-shader/ir.c
View File

@@ -8517,9 +8517,9 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro
* *
* neg sr0, vFOG.x * neg sr0, vFOG.x
* add sr1, FOG_END, sr0 * 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; return VKD3D_ERROR_OUT_OF_MEMORY;
ssa_temp = program->ssa_count++; 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); vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_MUL, 1, 2);
dst_param_init_ssa_float(&ins->dst[0], ssa_factor); 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_ssa_float(&ins->src[0], ssa_temp2);
src_param_init_parameter(&ins->src[1], VKD3D_SHADER_PARAMETER_NAME_FOG_SCALE, VSIR_DATA_F32); src_param_init_parameter(&ins->src[1], VKD3D_SHADER_PARAMETER_NAME_FOG_SCALE, VSIR_DATA_F32);
ins = vsir_program_iterator_next(it); 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 * mul sr0, FOG_SCALE, vFOG.x
* neg sr1, sr0 * 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; return VKD3D_ERROR_OUT_OF_MEMORY;
ssa_temp = program->ssa_count++; 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); vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_EXP, 1, 1);
dst_param_init_ssa_float(&ins->dst[0], ssa_factor); 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_ssa_float(&ins->src[0], ssa_temp2);
ins = vsir_program_iterator_next(it); ins = vsir_program_iterator_next(it);
break; 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 sr0, FOG_SCALE, vFOG.x
* mul sr1, sr0, sr0 * mul sr1, sr0, sr0
* neg sr2, sr1 * 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; return VKD3D_ERROR_OUT_OF_MEMORY;
ssa_temp = program->ssa_count++; 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); vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_EXP, 1, 1);
dst_param_init_ssa_float(&ins->dst[0], ssa_factor); 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); src_param_init_ssa_float(&ins->src[0], ssa_temp3);
ins = vsir_program_iterator_next(it); ins = vsir_program_iterator_next(it);
break; break;
@@ -8632,10 +8629,12 @@ static enum vkd3d_result insert_fragment_fog_before_ret(struct vsir_program *pro
* *
* neg sr0, FOG_COLOUR * neg sr0, FOG_COLOUR
* add sr1, FRAG_COLOUR, sr0 * 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_temp = program->ssa_count++;
ssa_temp2 = 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); vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_NEG, 1, 1);
dst_param_init_ssa_float4(&ins->dst[0], ssa_temp); 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); src_param_init_ssa_float4(&ins->src[1], ssa_temp);
ins = vsir_program_iterator_next(it); 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); 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, dst_param_init_output(&ins->dst[0], VSIR_DATA_F32, colour_signature_idx,
program->output_signature.elements[colour_signature_idx].mask); program->output_signature.elements[colour_signature_idx].mask);
src_param_init_ssa_float4(&ins->src[0], ssa_temp2); 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); src_param_init_parameter_vec4(&ins->src[2], VKD3D_SHADER_PARAMETER_NAME_FOG_COLOUR, VSIR_DATA_F32);
ins = vsir_program_iterator_next(it); ins = vsir_program_iterator_next(it);