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/ir: Rename VKD3D_DATA_UINT8 to VSIR_DATA_U8.

Browse Source
This commit is contained in:
Henri Verbeet
2025-07-17 16:34:07 +02:00
parent a04e4e4010
commit 40bbd61abd
Notes: Henri Verbeet 2025-07-22 17:20:45 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1633
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/d3d_asm.c
View File

@@ -395,7 +395,6 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum
[VKD3D_DATA_MIXED ] = "mixed", [VKD3D_DATA_MIXED ] = "mixed",
[VKD3D_DATA_CONTINUED] = "<continued>", [VKD3D_DATA_CONTINUED] = "<continued>",
[VKD3D_DATA_UNUSED ] = "<unused>", [VKD3D_DATA_UNUSED ] = "<unused>",
[VKD3D_DATA_UINT8 ] = "uint8",
[VKD3D_DATA_UINT64 ] = "uint64", [VKD3D_DATA_UINT64 ] = "uint64",
[VKD3D_DATA_BOOL ] = "bool", [VKD3D_DATA_BOOL ] = "bool",
[VKD3D_DATA_UINT16 ] = "uint16", [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_F32 ] = "float",
[VSIR_DATA_F64 ] = "double", [VSIR_DATA_F64 ] = "double",
[VSIR_DATA_I32 ] = "int", [VSIR_DATA_I32 ] = "int",
[VSIR_DATA_U8 ] = "uint8",
}; };
if (type < ARRAY_SIZE(data_type_names)) if (type < ARRAY_SIZE(data_type_names))

2
libs/vkd3d-shader/dxil.c
View File

@@ -2482,7 +2482,7 @@ static enum vsir_data_type vsir_data_type_from_dxil(const struct sm6_type *type)
case 1: case 1:
return VKD3D_DATA_BOOL; return VKD3D_DATA_BOOL;
case 8: case 8:
return VKD3D_DATA_UINT8; return VSIR_DATA_U8;
case 16: case 16:
return VKD3D_DATA_UINT16; return VKD3D_DATA_UINT16;
case 32: case 32:

5
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@@ -717,7 +717,6 @@ enum vsir_data_type
VKD3D_DATA_MIXED, VKD3D_DATA_MIXED,
VKD3D_DATA_CONTINUED, VKD3D_DATA_CONTINUED,
VKD3D_DATA_UNUSED, VKD3D_DATA_UNUSED,
VKD3D_DATA_UINT8,
VKD3D_DATA_UINT64, VKD3D_DATA_UINT64,
VKD3D_DATA_BOOL, VKD3D_DATA_BOOL,
VKD3D_DATA_UINT16, VKD3D_DATA_UINT16,
@@ -728,12 +727,14 @@ enum vsir_data_type
VSIR_DATA_I32, VSIR_DATA_I32,
VSIR_DATA_U8,
VSIR_DATA_TYPE_COUNT, VSIR_DATA_TYPE_COUNT,
}; };
static inline bool data_type_is_integer(enum vsir_data_type data_type) 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; || data_type == VKD3D_DATA_UINT || data_type == VKD3D_DATA_UINT64;
} }