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/dxil: Generate SSA values in sm6_parser_get_value_idx_by_ref().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-04-30 19:53:54 +02:00
committed by Henri Verbeet
parent 9e7ad75944
commit b8c6092a16
Notes: Henri Verbeet 2025-05-05 15:28:32 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1480
1 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,6 +647,7 @@ enum sm6_value_type
VALUE_TYPE_REG, VALUE_TYPE_REG,
VALUE_TYPE_ICB, VALUE_TYPE_ICB,
VALUE_TYPE_HANDLE, VALUE_TYPE_HANDLE,
VALUE_TYPE_SSA,
}; };
struct sm6_function_data struct sm6_function_data
@@ -663,6 +664,11 @@ struct sm6_handle_data
bool non_uniform; bool non_uniform;
}; };
struct sm6_ssa_data
{
unsigned int id;
};
struct sm6_value struct sm6_value
{ {
const struct sm6_type *type; const struct sm6_type *type;
@@ -675,6 +681,7 @@ struct sm6_value
struct sm6_function_data function; struct sm6_function_data function;
const struct vkd3d_shader_immediate_constant_buffer *icb; const struct vkd3d_shader_immediate_constant_buffer *icb;
struct sm6_handle_data handle; struct sm6_handle_data handle;
struct sm6_ssa_data ssa;
} u; } u;
struct vkd3d_shader_register reg; struct vkd3d_shader_register reg;
}; };
@@ -2232,7 +2239,15 @@ static inline struct sm6_value *sm6_parser_get_current_value(const struct sm6_pa
static inline bool sm6_value_is_register(const struct sm6_value *value) static inline bool sm6_value_is_register(const struct sm6_value *value)
{ {
return value->value_type == VALUE_TYPE_REG; switch (value->value_type)
{
case VALUE_TYPE_REG:
case VALUE_TYPE_SSA:
return true;
default:
return false;
}
} }
static bool sm6_value_is_handle(const struct sm6_value *value) static bool sm6_value_is_handle(const struct sm6_value *value)
@@ -2479,7 +2494,23 @@ static void src_param_init_vector(struct vkd3d_shader_src_param *param, unsigned
static void sm6_register_from_value(struct vkd3d_shader_register *reg, const struct sm6_value *value) static void sm6_register_from_value(struct vkd3d_shader_register *reg, const struct sm6_value *value)
{ {
switch (value->value_type)
{
case VALUE_TYPE_REG:
*reg = value->reg; *reg = value->reg;
break;
case VALUE_TYPE_SSA:
register_init_with_id(reg, VKD3DSPR_SSA, vkd3d_data_type_from_sm6_type(
sm6_type_get_scalar_type(value->type, 0)), value->u.ssa.id);
reg->dimension = sm6_type_is_scalar(value->type) ? VSIR_DIMENSION_SCALAR : VSIR_DIMENSION_VEC4;
break;
case VALUE_TYPE_FUNCTION:
case VALUE_TYPE_HANDLE:
case VALUE_TYPE_ICB:
vkd3d_unreachable();
}
} }
static void src_param_init_from_value(struct vkd3d_shader_src_param *param, const struct sm6_value *src) static void src_param_init_from_value(struct vkd3d_shader_src_param *param, const struct sm6_value *src)
@@ -2861,11 +2892,9 @@ static size_t sm6_parser_get_value_idx_by_ref(struct sm6_parser *sm6, const stru
else else
{ {
value->type = fwd_type; value->type = fwd_type;
value->value_type = VALUE_TYPE_REG; value->value_type = VALUE_TYPE_SSA;
register_init_with_id(&value->reg, VKD3DSPR_SSA, vkd3d_data_type_from_sm6_type( value->u.ssa.id = sm6_parser_alloc_ssa_id(sm6);
sm6_type_get_scalar_type(fwd_type, 0)), sm6_parser_alloc_ssa_id(sm6)); sm6_register_from_value(&value->reg, value);
value->reg.dimension = sm6_type_is_scalar(fwd_type) ? VSIR_DIMENSION_SCALAR
: VSIR_DIMENSION_VEC4;
} }
} }