vkd3d-shader/d3dbc: Use VKD3D_SM1_INSTRUCTION_LENGTH_SHIFT instead of D3DSI_INSTLENGTH_SHIFT.

This commit is contained in:
Henri Verbeet 2024-08-08 23:21:16 +02:00
parent b9693393fd
commit 03d76f653b
Notes: Henri Verbeet 2024-09-05 12:52:55 +02:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1038

View File

@ -1947,7 +1947,7 @@ static void d3dbc_write_instruction(struct d3dbc_compiler *d3dbc, const struct s
token |= VKD3D_SM1_INSTRUCTION_FLAGS_MASK & (instr->flags << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT); token |= VKD3D_SM1_INSTRUCTION_FLAGS_MASK & (instr->flags << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT);
if (version->major > 1) if (version->major > 1)
token |= (instr->has_dst + instr->src_count) << D3DSI_INSTLENGTH_SHIFT; token |= (instr->has_dst + instr->src_count) << VKD3D_SM1_INSTRUCTION_LENGTH_SHIFT;
put_u32(buffer, token); put_u32(buffer, token);
if (instr->has_dst) if (instr->has_dst)
@ -2415,7 +2415,7 @@ static void d3dbc_write_semantic_dcl(struct d3dbc_compiler *d3dbc,
token = VKD3D_SM1_OP_DCL; token = VKD3D_SM1_OP_DCL;
if (version->major > 1) if (version->major > 1)
token |= 2 << D3DSI_INSTLENGTH_SHIFT; token |= 2 << VKD3D_SM1_INSTRUCTION_LENGTH_SHIFT;
put_u32(buffer, token); put_u32(buffer, token);
token = (1u << 31); token = (1u << 31);