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/hlsl: Implement the InterlockedMax() intrinsic.

Browse Source
This commit is contained in:
Shaun Ren
2024-12-20 15:13:27 -05:00
committed by Henri Verbeet
parent b447fdce51
commit 63fbe161f2
Notes: Henri Verbeet 2025-01-20 16:18:51 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Elizabeth Figura (@zfigura)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1330
5 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d-shader/hlsl_codegen.c
View File

@@ -10003,6 +10003,7 @@ static bool sm4_generate_vsir_instr_interlocked(struct hlsl_ctx *ctx,
[HLSL_INTERLOCKED_ADD] = VKD3DSIH_ATOMIC_IADD,
[HLSL_INTERLOCKED_AND] = VKD3DSIH_ATOMIC_AND,
[HLSL_INTERLOCKED_CMP_EXCH] = VKD3DSIH_ATOMIC_CMP_STORE,
[HLSL_INTERLOCKED_MAX] = VKD3DSIH_ATOMIC_UMAX,
};
static const enum vkd3d_shader_opcode imm_opcodes[] =
@@ -10011,6 +10012,7 @@ static bool sm4_generate_vsir_instr_interlocked(struct hlsl_ctx *ctx,
[HLSL_INTERLOCKED_AND] = VKD3DSIH_IMM_ATOMIC_AND,
[HLSL_INTERLOCKED_CMP_EXCH] = VKD3DSIH_IMM_ATOMIC_CMP_EXCH,
[HLSL_INTERLOCKED_EXCH] = VKD3DSIH_IMM_ATOMIC_EXCH,
[HLSL_INTERLOCKED_MAX] = VKD3DSIH_IMM_ATOMIC_UMAX,
};
struct hlsl_ir_node *cmp_value = interlocked->cmp_value.node, *value = interlocked->value.node;
@@ -10022,6 +10024,15 @@ static bool sm4_generate_vsir_instr_interlocked(struct hlsl_ctx *ctx,
enum vkd3d_shader_opcode opcode;
opcode = is_imm ? imm_opcodes[interlocked->op] : opcodes[interlocked->op];
if (value->data_type->e.numeric.type == HLSL_TYPE_INT)
{
if (opcode == VKD3DSIH_ATOMIC_UMAX)
opcode = VKD3DSIH_ATOMIC_IMAX;
else if (opcode == VKD3DSIH_IMM_ATOMIC_UMAX)
opcode = VKD3DSIH_IMM_ATOMIC_IMAX;
}
if (!(ins = generate_vsir_add_program_instruction(ctx, program, &instr->loc, opcode,
is_imm ? 2 : 1, cmp_value ? 3 : 2)))
return false;