wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename shader_register_init() to vsir_register_init().

Browse Source
This commit is contained in:
Francisco Casas 2023-08-29 13:20:44 -04:00 committed by Alexandre Julliard
parent d9c8b49ea0
commit 5d6899888d
Notes: Alexandre Julliard 2023-09-26 22:47:43 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/319
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1590,7 +1590,7 @@ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_
static void register_init_with_id(struct vkd3d_shader_register *reg, static void register_init_with_id(struct vkd3d_shader_register *reg,
enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int id) enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int id)
{ {
shader_register_init(reg, reg_type, data_type, 1); vsir_register_init(reg, reg_type, data_type, 1);
reg->idx[0].offset = id; reg->idx[0].offset = id;
} }
@ -2119,7 +2119,7 @@ static void dst_param_io_init(struct vkd3d_shader_dst_param *param,
param->shift = 0; param->shift = 0;
/* DXIL types do not have signedness. Load signed elements as unsigned. */ /* DXIL types do not have signedness. Load signed elements as unsigned. */
component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type; component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type;
shader_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(component_type), 0); vsir_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(component_type), 0);
} }
static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s,
@ -2396,7 +2396,7 @@ static void sm6_parser_emit_unhandled(struct sm6_parser *sm6, struct vkd3d_shade
return; return;
type = sm6_type_get_scalar_type(dst->type, 0); type = sm6_type_get_scalar_type(dst->type, 0);
shader_register_init(&dst->u.reg, VKD3DSPR_UNDEF, vkd3d_data_type_from_sm6_type(type), 0); vsir_register_init(&dst->u.reg, VKD3DSPR_UNDEF, vkd3d_data_type_from_sm6_type(type), 0);
/* dst->is_undefined is not set here because it flags only explicitly undefined values. */ /* dst->is_undefined is not set here because it flags only explicitly undefined values. */
} }

6
libs/vkd3d-shader/ir.c
View File

@ -296,7 +296,7 @@ static enum vkd3d_result flattener_flatten_phases(struct hull_flattener *normali
return VKD3D_OK; return VKD3D_OK;
} }
void shader_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type,
enum vkd3d_data_type data_type, unsigned int idx_count) enum vkd3d_data_type data_type, unsigned int idx_count)
{ {
reg->type = reg_type; reg->type = reg_type;
@ -372,7 +372,7 @@ static struct vkd3d_shader_src_param *instruction_array_create_outpointid_param(
if (!(rel_addr = shader_src_param_allocator_get(&instructions->src_params, 1))) if (!(rel_addr = shader_src_param_allocator_get(&instructions->src_params, 1)))
return NULL; return NULL;
shader_register_init(&rel_addr->reg, VKD3DSPR_OUTPOINTID, VKD3D_DATA_UINT, 0); vsir_register_init(&rel_addr->reg, VKD3DSPR_OUTPOINTID, VKD3D_DATA_UINT, 0);
rel_addr->swizzle = 0; rel_addr->swizzle = 0;
rel_addr->modifiers = 0; rel_addr->modifiers = 0;
@ -402,7 +402,7 @@ static void shader_dst_param_io_init(struct vkd3d_shader_dst_param *param, const
param->write_mask = e->mask; param->write_mask = e->mask;
param->modifiers = 0; param->modifiers = 0;
param->shift = 0; param->shift = 0;
shader_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(e->component_type), idx_count); vsir_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(e->component_type), idx_count);
} }
static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_point_normaliser *normaliser, static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_point_normaliser *normaliser,

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

@ -751,7 +751,7 @@ struct vkd3d_shader_register
} u; } u;
}; };
void shader_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type,
enum vkd3d_data_type data_type, unsigned int idx_count); enum vkd3d_data_type data_type, unsigned int idx_count);
struct vkd3d_shader_dst_param struct vkd3d_shader_dst_param