From 8e2b35153803565fc93b878b25fedc668ecbb4b2 Mon Sep 17 00:00:00 2001 From: Conor McCarthy Date: Thu, 18 Apr 2024 11:32:52 +1000 Subject: [PATCH] vkd3d-shader/dxil: Implement DX intrinsic WaveAllTrue. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 51de7ecd..6e7a5306 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -328,6 +328,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOF ] = "utof", [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", + [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c1e3976f..33646e75 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -429,6 +429,7 @@ enum dx_intrinsic_opcode DX_PRIMITIVE_ID = 108, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, + DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -4515,6 +4516,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_F16TOF32; case DX_WAVE_ACTIVE_ALL_EQUAL: return VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL; + case DX_WAVE_ALL_TRUE: + return VKD3DSIH_WAVE_ALL_TRUE; default: vkd3d_unreachable(); } @@ -6045,6 +6048,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, + [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d6adb689..74ffdd57 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -528,6 +528,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOF, VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, + VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_XOR, VKD3DSIH_INVALID,