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 GROUPSHAREDMEM values in sm6_parser_declare_tgsm_raw().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-05-02 12:45:12 +02:00
committed by Henri Verbeet
parent cb5a548740
commit fd918062d6
Notes: Henri Verbeet 2025-05-12 15:43:45 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1486
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,6 +650,7 @@ enum sm6_value_type
VALUE_TYPE_SSA, VALUE_TYPE_SSA,
VALUE_TYPE_ICB, VALUE_TYPE_ICB,
VALUE_TYPE_IDXTEMP, VALUE_TYPE_IDXTEMP,
VALUE_TYPE_GROUPSHAREDMEM,
VALUE_TYPE_UNDEFINED, VALUE_TYPE_UNDEFINED,
VALUE_TYPE_INVALID, VALUE_TYPE_INVALID,
}; };
@@ -684,6 +685,11 @@ struct sm6_idxtemp_data
unsigned int id; unsigned int id;
}; };
struct sm6_groupsharedmem_data
{
unsigned int id;
};
struct sm6_value struct sm6_value
{ {
const struct sm6_type *type; const struct sm6_type *type;
@@ -698,6 +704,7 @@ struct sm6_value
struct sm6_ssa_data ssa; struct sm6_ssa_data ssa;
struct sm6_icb_data icb; struct sm6_icb_data icb;
struct sm6_idxtemp_data idxtemp; struct sm6_idxtemp_data idxtemp;
struct sm6_groupsharedmem_data groupsharedmem;
} u; } u;
struct vkd3d_shader_register reg; struct vkd3d_shader_register reg;
}; };
@@ -2261,6 +2268,7 @@ static inline bool sm6_value_is_register(const struct sm6_value *value)
case VALUE_TYPE_SSA: case VALUE_TYPE_SSA:
case VALUE_TYPE_ICB: case VALUE_TYPE_ICB:
case VALUE_TYPE_IDXTEMP: case VALUE_TYPE_IDXTEMP:
case VALUE_TYPE_GROUPSHAREDMEM:
case VALUE_TYPE_UNDEFINED: case VALUE_TYPE_UNDEFINED:
case VALUE_TYPE_INVALID: case VALUE_TYPE_INVALID:
return true; return true;
@@ -2450,6 +2458,10 @@ static void sm6_register_from_value(struct vkd3d_shader_register *reg, const str
register_init_with_id(reg, VKD3DSPR_IDXTEMP, data_type, value->u.idxtemp.id); register_init_with_id(reg, VKD3DSPR_IDXTEMP, data_type, value->u.idxtemp.id);
break; break;
case VALUE_TYPE_GROUPSHAREDMEM:
register_init_with_id(reg, VKD3DSPR_GROUPSHAREDMEM, data_type, value->u.groupsharedmem.id);
break;
case VALUE_TYPE_UNDEFINED: case VALUE_TYPE_UNDEFINED:
case VALUE_TYPE_INVALID: case VALUE_TYPE_INVALID:
vsir_register_init(reg, VKD3DSPR_UNDEF, data_type, 0); vsir_register_init(reg, VKD3DSPR_UNDEF, data_type, 0);
@@ -3538,15 +3550,16 @@ static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const stru
static void sm6_parser_declare_tgsm_raw(struct sm6_parser *sm6, const struct sm6_type *elem_type, static void sm6_parser_declare_tgsm_raw(struct sm6_parser *sm6, const struct sm6_type *elem_type,
unsigned int alignment, unsigned int init, struct sm6_value *dst) unsigned int alignment, unsigned int init, struct sm6_value *dst)
{ {
enum vkd3d_data_type data_type = vkd3d_data_type_from_sm6_type(elem_type);
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
unsigned int byte_count; unsigned int byte_count;
ins = sm6_parser_add_instruction(sm6, VKD3DSIH_DCL_TGSM_RAW); ins = sm6_parser_add_instruction(sm6, VKD3DSIH_DCL_TGSM_RAW);
dst_param_init(&ins->declaration.tgsm_raw.reg); dst_param_init(&ins->declaration.tgsm_raw.reg);
register_init_with_id(&ins->declaration.tgsm_raw.reg.reg, VKD3DSPR_GROUPSHAREDMEM, data_type, sm6->tgsm_count++); dst->value_type = VALUE_TYPE_GROUPSHAREDMEM;
dst->reg = ins->declaration.tgsm_raw.reg.reg; dst->u.groupsharedmem.id = sm6->tgsm_count++;
dst->structure_stride = 0; dst->structure_stride = 0;
sm6_register_from_value(&dst->reg, dst);
sm6_register_from_value(&ins->declaration.tgsm_raw.reg.reg, dst);
ins->declaration.tgsm_raw.alignment = alignment; ins->declaration.tgsm_raw.alignment = alignment;
byte_count = elem_type->u.width / 8u; byte_count = elem_type->u.width / 8u;
if (byte_count != 4) if (byte_count != 4)