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_OPAQUE to VSIR_DATA_OPAQUE.

Browse Source
This commit is contained in:
Henri Verbeet
2025-07-21 15:12:49 +02:00
parent ed695cc551
commit b055a16e03
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
3 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_OPAQUE ] = "opaque",
[VKD3D_DATA_MIXED ] = "mixed", [VKD3D_DATA_MIXED ] = "mixed",
[VKD3D_DATA_CONTINUED] = "<continued>", [VKD3D_DATA_CONTINUED] = "<continued>",
[VKD3D_DATA_UNUSED ] = "<unused>", [VKD3D_DATA_UNUSED ] = "<unused>",
@@ -403,6 +402,7 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum
[VSIR_DATA_U64 ] = "uint64", [VSIR_DATA_U64 ] = "uint64",
[VSIR_DATA_SNORM ] = "snorm", [VSIR_DATA_SNORM ] = "snorm",
[VSIR_DATA_UNORM ] = "unorm", [VSIR_DATA_UNORM ] = "unorm",
[VSIR_DATA_OPAQUE ] = "opaque",
}; };
if (type < ARRAY_SIZE(data_type_names)) if (type < ARRAY_SIZE(data_type_names))

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

@@ -979,8 +979,7 @@ static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins
unsigned int *io_masks; unsigned int *io_masks;
uint32_t write_mask; uint32_t write_mask;
shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VSIR_DATA_OPAQUE, &index_range->dst);
&index_range->dst);
index_range->register_count = *tokens; index_range->register_count = *tokens;
register_idx = index_range->dst.reg.idx[index_range->dst.reg.idx_count - 1].offset; register_idx = index_range->dst.reg.idx[index_range->dst.reg.idx_count - 1].offset;
@@ -1228,7 +1227,7 @@ static void shader_sm5_read_fcall(struct vkd3d_shader_instruction *ins, uint32_t
const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv)
{ {
ins->src[0].reg.u.fp_body_idx = *tokens++; ins->src[0].reg.u.fp_body_idx = *tokens++;
shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, &ins->src[0]); shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VSIR_DATA_OPAQUE, &ins->src[0]);
} }
static void shader_sm5_read_dcl_function_body(struct vkd3d_shader_instruction *ins, uint32_t opcode, static void shader_sm5_read_dcl_function_body(struct vkd3d_shader_instruction *ins, uint32_t opcode,
@@ -1434,7 +1433,7 @@ static void init_sm4_lookup_tables(struct vkd3d_sm4_lookup_tables *lookup)
* f -> VSIR_DATA_F32 * f -> VSIR_DATA_F32
* i -> VSIR_DATA_I32 * i -> VSIR_DATA_I32
* u -> VSIR_DATA_U32 * u -> VSIR_DATA_U32
* O -> VKD3D_DATA_OPAQUE * O -> VSIR_DATA_OPAQUE
* R -> VKD3D_DATA_RESOURCE * R -> VKD3D_DATA_RESOURCE
* S -> VKD3D_DATA_SAMPLER * S -> VKD3D_DATA_SAMPLER
* U -> VKD3D_DATA_UAV * U -> VKD3D_DATA_UAV
@@ -1998,7 +1997,7 @@ static enum vsir_data_type map_data_type(char t)
case 'u': case 'u':
return VSIR_DATA_U32; return VSIR_DATA_U32;
case 'O': case 'O':
return VKD3D_DATA_OPAQUE; return VSIR_DATA_OPAQUE;
case '*': case '*':
return VKD3D_DATA_UNUSED; return VKD3D_DATA_UNUSED;
default: default:

3
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_OPAQUE,
VKD3D_DATA_MIXED, VKD3D_DATA_MIXED,
VKD3D_DATA_CONTINUED, VKD3D_DATA_CONTINUED,
VKD3D_DATA_UNUSED, VKD3D_DATA_UNUSED,
@@ -730,6 +729,8 @@ enum vsir_data_type
VSIR_DATA_SNORM, VSIR_DATA_SNORM,
VSIR_DATA_UNORM, VSIR_DATA_UNORM,
VSIR_DATA_OPAQUE,
VSIR_DATA_TYPE_COUNT, VSIR_DATA_TYPE_COUNT,
}; };