From 40bbd61abd0dd92ee4060bee18c924c2c1b83d8a Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 17 Jul 2025 16:34:07 +0200 Subject: [PATCH] vkd3d-shader/ir: Rename VKD3D_DATA_UINT8 to VSIR_DATA_U8. --- libs/vkd3d-shader/d3d_asm.c | 2 +- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 043740aad..9c1313558 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -395,7 +395,6 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum [VKD3D_DATA_MIXED ] = "mixed", [VKD3D_DATA_CONTINUED] = "", [VKD3D_DATA_UNUSED ] = "", - [VKD3D_DATA_UINT8 ] = "uint8", [VKD3D_DATA_UINT64 ] = "uint64", [VKD3D_DATA_BOOL ] = "bool", [VKD3D_DATA_UINT16 ] = "uint16", @@ -403,6 +402,7 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum [VSIR_DATA_F32 ] = "float", [VSIR_DATA_F64 ] = "double", [VSIR_DATA_I32 ] = "int", + [VSIR_DATA_U8 ] = "uint8", }; if (type < ARRAY_SIZE(data_type_names)) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b8e51b4c3..5067ef777 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2482,7 +2482,7 @@ static enum vsir_data_type vsir_data_type_from_dxil(const struct sm6_type *type) case 1: return VKD3D_DATA_BOOL; case 8: - return VKD3D_DATA_UINT8; + return VSIR_DATA_U8; case 16: return VKD3D_DATA_UINT16; case 32: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b864b0bab..2e4d92f41 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -717,7 +717,6 @@ enum vsir_data_type VKD3D_DATA_MIXED, VKD3D_DATA_CONTINUED, VKD3D_DATA_UNUSED, - VKD3D_DATA_UINT8, VKD3D_DATA_UINT64, VKD3D_DATA_BOOL, VKD3D_DATA_UINT16, @@ -728,12 +727,14 @@ enum vsir_data_type VSIR_DATA_I32, + VSIR_DATA_U8, + VSIR_DATA_TYPE_COUNT, }; static inline bool data_type_is_integer(enum vsir_data_type data_type) { - return data_type == VSIR_DATA_I32 || data_type == VKD3D_DATA_UINT8 || data_type == VKD3D_DATA_UINT16 + return data_type == VSIR_DATA_I32 || data_type == VSIR_DATA_U8 || data_type == VKD3D_DATA_UINT16 || data_type == VKD3D_DATA_UINT || data_type == VKD3D_DATA_UINT64; }