wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d-shader/hlsl.c
View File

@ -3510,6 +3510,7 @@ static void dump_ir_interlocked(struct vkd3d_string_buffer *buffer, const struct
[HLSL_INTERLOCKED_AND] = "and",
[HLSL_INTERLOCKED_CMP_EXCH] = "cmp_exch",
[HLSL_INTERLOCKED_EXCH] = "exch",
[HLSL_INTERLOCKED_MAX] = "max",
};
VKD3D_ASSERT(interlocked->op < ARRAY_SIZE(op_names));

1
libs/vkd3d-shader/hlsl.h
View File

@ -957,6 +957,7 @@ enum hlsl_interlocked_op
HLSL_INTERLOCKED_AND,
HLSL_INTERLOCKED_CMP_EXCH,
HLSL_INTERLOCKED_EXCH,
HLSL_INTERLOCKED_MAX,
};
/* Represents an interlocked operation.

23
libs/vkd3d-shader/hlsl.y
View File

@ -5429,7 +5429,21 @@ static bool intrinsic_interlocked(struct hlsl_ctx *ctx, enum hlsl_interlocked_op
/* Interlocked*() functions always take uint for the value parameters,
* except for InterlockedMax()/InterlockedMin(). */
val_type = hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT);
if (op == HLSL_INTERLOCKED_MAX)
{
enum hlsl_base_type val_base_type = val->data_type->e.numeric.type;
/* Floating values are always cast to signed integers. */
if (val_base_type == HLSL_TYPE_FLOAT || val_base_type == HLSL_TYPE_HALF || val_base_type == HLSL_TYPE_DOUBLE)
val_type = hlsl_get_scalar_type(ctx, HLSL_TYPE_INT);
else
val_type = hlsl_get_scalar_type(ctx, lhs_type->e.numeric.type);
}
else
{
val_type = hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT);
}
if (cmp_val && !(cmp_val = add_implicit_conversion(ctx, params->instrs, cmp_val, val_type, loc)))
return false;
if (!(val = add_implicit_conversion(ctx, params->instrs, val, val_type, loc)))
@ -5516,6 +5530,12 @@ static bool intrinsic_InterlockedExchange(struct hlsl_ctx *ctx,
return intrinsic_interlocked(ctx, HLSL_INTERLOCKED_EXCH, params, loc, "InterlockedExchange");
}
static bool intrinsic_InterlockedMax(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
return intrinsic_interlocked(ctx, HLSL_INTERLOCKED_MAX, params, loc, "InterlockedMax");
}
static const struct intrinsic_function
{
const char *name;
@ -5534,6 +5554,7 @@ intrinsic_functions[] =
{"InterlockedCompareExchange", 4, true, intrinsic_InterlockedCompareExchange},
{"InterlockedCompareStore", 3, true, intrinsic_InterlockedCompareStore},
{"InterlockedExchange", 3, true, intrinsic_InterlockedExchange},
{"InterlockedMax", -1, true, intrinsic_InterlockedMax},
{"abs", 1, true, intrinsic_abs},
{"acos", 1, true, intrinsic_acos},
{"all", 1, true, intrinsic_all},

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;

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

@ -4029,6 +4029,8 @@ static void tpf_handle_instruction(struct tpf_compiler *tpf, const struct vkd3d_
case VKD3DSIH_ATOMIC_AND:
case VKD3DSIH_ATOMIC_CMP_STORE:
case VKD3DSIH_ATOMIC_IADD:
case VKD3DSIH_ATOMIC_IMAX:
case VKD3DSIH_ATOMIC_UMAX:
case VKD3DSIH_AND:
case VKD3DSIH_BREAK:
case VKD3DSIH_CASE:
@ -4075,6 +4077,8 @@ static void tpf_handle_instruction(struct tpf_compiler *tpf, const struct vkd3d_
case VKD3DSIH_IMM_ATOMIC_CMP_EXCH:
case VKD3DSIH_IMM_ATOMIC_EXCH:
case VKD3DSIH_IMM_ATOMIC_IADD:
case VKD3DSIH_IMM_ATOMIC_IMAX:
case VKD3DSIH_IMM_ATOMIC_UMAX:
case VKD3DSIH_IMUL:
case VKD3DSIH_INE:
case VKD3DSIH_INEG: