wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Write sysval semantic consistently.

Browse Source 
Specifically we should write the sysval semantic as an instruction idx
for the following instructions:

    VKD3D_SM4_OP_DCL_INPUT_SGV
    VKD3D_SM4_OP_DCL_INPUT_PS_SGV
    VKD3D_SM4_OP_DCL_INPUT_SIV
    VKD3D_SM4_OP_DCL_INPUT_PS_SIV
    VKD3D_SM4_OP_DCL_OUTPUT_SIV

and not the following ones:

    VKD3D_SM4_OP_DCL_INPUT
    VKD3D_SM4_OP_DCL_PS_INPUT
    VKD3D_SM4_OP_DCL_OUTPUT

Which is consistent with what we do when reading these instructions in
the following functions:

    shader_sm4_read_declaration_register_semantic()
    shader_sm4_read_dcl_input_ps_siv()

and

    shader_sm4_read_dcl_input_ps()
    shader_sm4_read_declaration_dst()

for the non-SGV and non-SIV cases.

Note that the non-SGV and non-SIV instructions don't need/use this
extra information because they rely on the dst register type and index.

I suggest to introduce this change because the here replaced check is
brittle, and we might be omitting the sysval semantic in some cases.
This commit is contained in:
Francisco Casas
2024-10-10 19:35:34 -03:00
committed by Henri Verbeet
parent 5fb3a91276
commit ad2f821ff5
Notes: Henri Verbeet 2024-10-15 17:04:18 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1174
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4877,20 +4877,20 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl
instr.opcode = VKD3D_SM4_OP_DCL_OUTPUT_SIV; instr.opcode = VKD3D_SM4_OP_DCL_OUTPUT_SIV;
} }
switch (semantic) if (instr.opcode == VKD3D_SM4_OP_DCL_OUTPUT)
{ {
case VKD3D_SHADER_SV_COVERAGE: VKD3D_ASSERT(semantic == VKD3D_SHADER_SV_NONE || semantic == VKD3D_SHADER_SV_TARGET
case VKD3D_SHADER_SV_DEPTH: || instr.dsts[0].reg.type != VKD3DSPR_OUTPUT);
case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL: }
case VKD3D_SHADER_SV_DEPTH_LESS_EQUAL: else if (instr.opcode == VKD3D_SM4_OP_DCL_INPUT || instr.opcode == VKD3D_SM4_OP_DCL_INPUT_PS)
case VKD3D_SHADER_SV_TARGET: {
case VKD3D_SHADER_SV_NONE: VKD3D_ASSERT(semantic == VKD3D_SHADER_SV_NONE);
break; }
else
default: {
instr.idx_count = 1; VKD3D_ASSERT(semantic != VKD3D_SHADER_SV_NONE);
instr.idx[0] = semantic; instr.idx_count = 1;
break; instr.idx[0] = semantic;
} }
write_sm4_instruction(tpf, &instr); write_sm4_instruction(tpf, &instr);