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_MIXED to VSIR_DATA_MIXED.

Browse Source
This commit is contained in:
Henri Verbeet
2025-07-21 15:15:35 +02:00
parent b055a16e03
commit ca24aada9a
Notes: Henri Verbeet 2025-07-23 17:30:46 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1639
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,7 +388,6 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum
{ {
static const char *const data_type_names[] = static const char *const data_type_names[] =
{ {
[VKD3D_DATA_MIXED ] = "mixed",
[VKD3D_DATA_CONTINUED] = "<continued>", [VKD3D_DATA_CONTINUED] = "<continued>",
[VKD3D_DATA_UNUSED ] = "<unused>", [VKD3D_DATA_UNUSED ] = "<unused>",
[VKD3D_DATA_BOOL ] = "bool", [VKD3D_DATA_BOOL ] = "bool",
@@ -403,6 +402,7 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum
[VSIR_DATA_SNORM ] = "snorm", [VSIR_DATA_SNORM ] = "snorm",
[VSIR_DATA_UNORM ] = "unorm", [VSIR_DATA_UNORM ] = "unorm",
[VSIR_DATA_OPAQUE ] = "opaque", [VSIR_DATA_OPAQUE ] = "opaque",
[VSIR_DATA_MIXED ] = "mixed",
}; };
if (type < ARRAY_SIZE(data_type_names)) if (type < ARRAY_SIZE(data_type_names))

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

@@ -8239,7 +8239,7 @@ static enum vsir_data_type vsir_data_type_from_hlsl_type(struct hlsl_ctx *ctx, c
if (type->class == HLSL_CLASS_ARRAY) if (type->class == HLSL_CLASS_ARRAY)
return vsir_data_type_from_hlsl_type(ctx, type->e.array.type); return vsir_data_type_from_hlsl_type(ctx, type->e.array.type);
if (type->class == HLSL_CLASS_STRUCT) if (type->class == HLSL_CLASS_STRUCT)
return VKD3D_DATA_MIXED; return VSIR_DATA_MIXED;
if (type->class <= HLSL_CLASS_LAST_NUMERIC) if (type->class <= HLSL_CLASS_LAST_NUMERIC)
{ {
switch (type->e.numeric.type) switch (type->e.numeric.type)

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

@@ -756,7 +756,7 @@ static const enum vsir_data_type data_type_table[] =
/* VKD3D_SM4_DATA_INT */ VSIR_DATA_I32, /* VKD3D_SM4_DATA_INT */ VSIR_DATA_I32,
/* VKD3D_SM4_DATA_UINT */ VSIR_DATA_U32, /* VKD3D_SM4_DATA_UINT */ VSIR_DATA_U32,
/* VKD3D_SM4_DATA_FLOAT */ VSIR_DATA_F32, /* VKD3D_SM4_DATA_FLOAT */ VSIR_DATA_F32,
/* VKD3D_SM4_DATA_MIXED */ VKD3D_DATA_MIXED, /* VKD3D_SM4_DATA_MIXED */ VSIR_DATA_MIXED,
/* VKD3D_SM4_DATA_DOUBLE */ VSIR_DATA_F64, /* VKD3D_SM4_DATA_DOUBLE */ VSIR_DATA_F64,
/* VKD3D_SM4_DATA_CONTINUED */ VKD3D_DATA_CONTINUED, /* VKD3D_SM4_DATA_CONTINUED */ VKD3D_DATA_CONTINUED,
/* VKD3D_SM4_DATA_UNUSED */ VKD3D_DATA_UNUSED, /* VKD3D_SM4_DATA_UNUSED */ VKD3D_DATA_UNUSED,

4
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@@ -1526,8 +1526,6 @@ static enum vkd3d_shader_resource_data_type vkd3d_resource_data_type_from_data_t
{ {
switch (data_type) switch (data_type)
{ {
case VKD3D_DATA_MIXED:
return VKD3D_SHADER_RESOURCE_DATA_MIXED;
case VKD3D_DATA_CONTINUED: case VKD3D_DATA_CONTINUED:
return VKD3D_SHADER_RESOURCE_DATA_CONTINUED; return VKD3D_SHADER_RESOURCE_DATA_CONTINUED;
case VKD3D_DATA_UNUSED: case VKD3D_DATA_UNUSED:
@@ -1544,6 +1542,8 @@ static enum vkd3d_shader_resource_data_type vkd3d_resource_data_type_from_data_t
return VKD3D_SHADER_RESOURCE_DATA_SNORM; return VKD3D_SHADER_RESOURCE_DATA_SNORM;
case VSIR_DATA_UNORM: case VSIR_DATA_UNORM:
return VKD3D_SHADER_RESOURCE_DATA_UNORM; return VKD3D_SHADER_RESOURCE_DATA_UNORM;
case VSIR_DATA_MIXED:
return VKD3D_SHADER_RESOURCE_DATA_MIXED;
default: default:
ERR("Invalid resource data type %#x.\n", data_type); ERR("Invalid resource data type %#x.\n", data_type);
return VKD3D_SHADER_RESOURCE_DATA_FLOAT; return VKD3D_SHADER_RESOURCE_DATA_FLOAT;

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

@@ -710,7 +710,6 @@ enum vkd3d_shader_register_precision
enum vsir_data_type enum vsir_data_type
{ {
VKD3D_DATA_MIXED,
VKD3D_DATA_CONTINUED, VKD3D_DATA_CONTINUED,
VKD3D_DATA_UNUSED, VKD3D_DATA_UNUSED,
VKD3D_DATA_BOOL, VKD3D_DATA_BOOL,
@@ -730,6 +729,7 @@ enum vsir_data_type
VSIR_DATA_UNORM, VSIR_DATA_UNORM,
VSIR_DATA_OPAQUE, VSIR_DATA_OPAQUE,
VSIR_DATA_MIXED,
VSIR_DATA_TYPE_COUNT, VSIR_DATA_TYPE_COUNT,
}; };
@@ -1825,7 +1825,7 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty
default: default:
FIXME("Unhandled data type %#x.\n", data_type); FIXME("Unhandled data type %#x.\n", data_type);
/* fall-through */ /* fall-through */
case VKD3D_DATA_MIXED: case VSIR_DATA_MIXED:
return VKD3D_SHADER_COMPONENT_UINT; return VKD3D_SHADER_COMPONENT_UINT;
} }
} }