wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Initialise or validate forward-referenced values in a helper function.

Browse Source 
A future patch needs to call this function from another location.
This commit is contained in:
Conor McCarthy
2024-09-30 15:45:35 +10:00
committed by Henri Verbeet
parent 8a6c5cb401
commit 7d3a520060
Notes: Henri Verbeet 2025-11-20 18:36:32 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1133
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3057,10 +3057,34 @@ static struct sm6_value *sm6_parser_get_value_safe(struct sm6_parser *sm6, unsig
return NULL;
}
static void sm6_parser_pre_init_or_validate_referenced_value(struct sm6_parser *dxil,
size_t operand, const struct sm6_type *fwd_type)
{
struct sm6_value *value;
value = &dxil->values[operand];
/* If the value has a type, validate that it matches the expected type,
* otherwise it is a forward reference and we must set the type and
* initialise the value's register to SSA so it can be consumed by an
* instruction. */
if (value->type)
{
if (value->type != fwd_type)
vkd3d_shader_parser_warning(&dxil->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH,
"The type of a source value does not match the predefined type.");
}
else
{
value->type = fwd_type;
value->value_type = VALUE_TYPE_SSA;
value->u.ssa.id = sm6_parser_alloc_ssa_id(dxil);
}
}
static size_t sm6_parser_get_value_idx_by_ref(struct sm6_parser *sm6, const struct dxil_record *record,
const struct sm6_type *fwd_type, unsigned int *rec_idx)
{
struct sm6_value *value;
unsigned int idx;
uint64_t val_ref;
size_t operand;
@@ -3086,24 +3110,7 @@ static size_t sm6_parser_get_value_idx_by_ref(struct sm6_parser *sm6, const stru
*rec_idx = idx;
if (fwd_type)
{
value = &sm6->values[operand];
if (value->type)
{
if (value->type != fwd_type)
{
WARN("Value already has a mismatching type.\n");
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH,
"The type of a source value does not match the predefined type.");
}
}
else
{
value->type = fwd_type;
value->value_type = VALUE_TYPE_SSA;
value->u.ssa.id = sm6_parser_alloc_ssa_id(sm6);
}
}
sm6_parser_pre_init_or_validate_referenced_value(sm6, operand, fwd_type);
return operand;
}