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 InterlockedCompareStore() intrinsic.

Browse Source
This commit is contained in:
Shaun Ren 2024-12-12 18:44:24 -05:00 committed by Henri Verbeet
parent 22ab08f4d8
commit 3fb47373a1
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
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5403,7 +5403,8 @@ static bool intrinsic_interlocked(struct hlsl_ctx *ctx, enum hlsl_interlocked_op
{
cmp_val = params->args[1];
val = params->args[2];
orig_val = params->args[3];
if (params->args_count == 4)
orig_val = params->args[3];
}
else
{
@ -5502,6 +5503,12 @@ static bool intrinsic_InterlockedCompareExchange(struct hlsl_ctx *ctx,
return intrinsic_interlocked(ctx, HLSL_INTERLOCKED_CMP_EXCH, params, loc, "InterlockedCompareExchange");
}
static bool intrinsic_InterlockedCompareStore(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
return intrinsic_interlocked(ctx, HLSL_INTERLOCKED_CMP_EXCH, params, loc, "InterlockedCompareStore");
}
static const struct intrinsic_function
{
const char *name;
@ -5518,6 +5525,7 @@ intrinsic_functions[] =
{"InterlockedAdd", -1, true, intrinsic_InterlockedAdd},
{"InterlockedAnd", -1, true, intrinsic_InterlockedAnd},
{"InterlockedCompareExchange", 4, true, intrinsic_InterlockedCompareExchange},
{"InterlockedCompareStore", 3, true, intrinsic_InterlockedCompareStore},
{"abs", 1, true, intrinsic_abs},
{"acos", 1, true, intrinsic_acos},
{"all", 1, true, intrinsic_all},

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

@ -10002,6 +10002,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,
};
static const enum vkd3d_shader_opcode imm_opcodes[] =

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

@ -4027,6 +4027,7 @@ static void tpf_handle_instruction(struct tpf_compiler *tpf, const struct vkd3d_
case VKD3DSIH_ADD:
case VKD3DSIH_ATOMIC_AND:
case VKD3DSIH_ATOMIC_CMP_STORE:
case VKD3DSIH_ATOMIC_IADD:
case VKD3DSIH_AND:
case VKD3DSIH_BREAK: