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: Generate vsir for HLSL_IR_SYNC operations.

Browse Source 
The following table shows how each intrinsic maps to d3d assembly and the
flags that appear in the tpf bytecode, in binary.

    GroupMemoryBarrier()                   sync_g               0010
    GroupMemoryBarrierWithGroupSync()      sync_g_t             0011
    DeviceMemoryBarrier()                  sync_uglobal         1000
    DeviceMemoryBarrierWithGroupSync()     sync_uglobal_t       1001
    AllMemoryBarrier()                     sync_uglobal_g       1010
    AllMemoryBarrierWithGroupSync()        sync_uglobal_g_t     1011
This commit is contained in:
Francisco Casas
2025-04-18 04:21:36 -04:00
committed by Henri Verbeet
parent a975c56695
commit b89f0bc730
Notes: Henri Verbeet 2025-05-05 15:28:08 +02:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1470
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11278,6 +11278,19 @@ static bool sm4_generate_vsir_instr_jump(struct hlsl_ctx *ctx,
} }
} }
static bool sm4_generate_vsir_instr_sync(struct hlsl_ctx *ctx,
struct vsir_program *program, const struct hlsl_ir_sync *sync)
{
const struct hlsl_ir_node *instr = &sync->node;
struct vkd3d_shader_instruction *ins;
if (!(ins = generate_vsir_add_program_instruction(ctx, program, &instr->loc, VKD3DSIH_SYNC, 0, 0)))
return false;
ins->flags = sync->sync_flags;
return true;
}
static void sm4_generate_vsir_block(struct hlsl_ctx *ctx, struct hlsl_block *block, struct vsir_program *program); static void sm4_generate_vsir_block(struct hlsl_ctx *ctx, struct hlsl_block *block, struct vsir_program *program);
static void sm4_generate_vsir_instr_if(struct hlsl_ctx *ctx, struct vsir_program *program, struct hlsl_ir_if *iff) static void sm4_generate_vsir_instr_if(struct hlsl_ctx *ctx, struct vsir_program *program, struct hlsl_ir_if *iff)
@@ -11429,7 +11442,7 @@ static void sm4_generate_vsir_block(struct hlsl_ctx *ctx, struct hlsl_block *blo
break; break;
case HLSL_IR_SYNC: case HLSL_IR_SYNC:
hlsl_fixme(ctx, &instr->loc, "Sync instructions."); sm4_generate_vsir_instr_sync(ctx, program, hlsl_ir_sync(instr));
break; break;
default: default:

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

@@ -4213,6 +4213,7 @@ static void tpf_handle_instruction(struct tpf_compiler *tpf, const struct vkd3d_
case VKD3DSIH_IMM_ATOMIC_UMIN: case VKD3DSIH_IMM_ATOMIC_UMIN:
case VKD3DSIH_IMM_ATOMIC_OR: case VKD3DSIH_IMM_ATOMIC_OR:
case VKD3DSIH_IMM_ATOMIC_XOR: case VKD3DSIH_IMM_ATOMIC_XOR:
case VKD3DSIH_SYNC:
case VKD3DSIH_IMUL: case VKD3DSIH_IMUL:
case VKD3DSIH_INE: case VKD3DSIH_INE:
case VKD3DSIH_INEG: case VKD3DSIH_INEG:

2
tests/hlsl/barriers.shader_test
View File

@@ -2,7 +2,7 @@
shader model >= 5.0 shader model >= 5.0
% This is just a parsing test. % This is just a parsing test.
[compute shader todo] [compute shader]
[numthreads(1024, 1, 1)] [numthreads(1024, 1, 1)]
void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID) void main(uint local_idx : SV_GroupIndex, uint group_id : SV_GroupID)
{ {