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: Allocate instructions directly in sm6_parser_emit_alloca().

Browse Source 
I think the main argument for preallocating instructions and
passing them to helpers is that this simplifies error handling.
However it seems that the simplification is close to negligible,
while the current solution makes it harder to use the iterator
abstraction layer for the instruction array, and it also makes
the code harder to read and check.
This commit is contained in:
Giovanni Mascellani
2025-11-25 23:13:28 +01:00
committed by Henri Verbeet
parent 3b9fbe3e4a
commit 26f9644fb6
Notes: Henri Verbeet 2025-12-02 14:37:33 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1839
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4450,8 +4450,26 @@ struct function_emission_state
const struct dxil_record *record; const struct dxil_record *record;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
unsigned int temp_idx; unsigned int temp_idx;
/* Keep track of whether the helper below sm6_parser_function_init()
* already incremented the instruction count or not. Excepected to be
* removed once all helpers increment the count. */
bool pushed_instruction;
}; };
static struct vkd3d_shader_instruction *sm6_parser_add_function_instruction(struct sm6_parser *sm6,
struct function_emission_state *state)
{
struct sm6_function *function = state->function;
struct vkd3d_shader_instruction *ins;
if (!(ins = shader_instruction_array_append(&function->instructions)))
vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY,
"Out of memory allocating instruction.");
return ins;
}
static bool sm6_parser_emit_reg_composite_construct(struct sm6_parser *sm6, static bool sm6_parser_emit_reg_composite_construct(struct sm6_parser *sm6,
const struct vkd3d_shader_register *operand_regs, unsigned int component_count, const struct vkd3d_shader_register *operand_regs, unsigned int component_count,
struct function_emission_state *state, struct vkd3d_shader_register *reg); struct function_emission_state *state, struct vkd3d_shader_register *reg);
@@ -4459,9 +4477,9 @@ static bool sm6_parser_emit_reg_composite_construct(struct sm6_parser *sm6,
static void sm6_parser_emit_alloca(struct sm6_parser *sm6, struct function_emission_state *state) static void sm6_parser_emit_alloca(struct sm6_parser *sm6, struct function_emission_state *state)
{ {
struct sm6_value *dst = sm6_parser_get_current_value(sm6); struct sm6_value *dst = sm6_parser_get_current_value(sm6);
struct vkd3d_shader_instruction *ins = state->ins;
const struct dxil_record *record = state->record; const struct dxil_record *record = state->record;
const struct sm6_type *type[2], *elem_type; const struct sm6_type *type[2], *elem_type;
struct vkd3d_shader_instruction *ins;
const struct sm6_value *size; const struct sm6_value *size;
unsigned int i, alignment; unsigned int i, alignment;
uint64_t packed_operands; uint64_t packed_operands;
@@ -4528,6 +4546,10 @@ static void sm6_parser_emit_alloca(struct sm6_parser *sm6, struct function_emiss
if (packed_operands) if (packed_operands)
WARN("Ignoring flags %#"PRIx64".\n", packed_operands); WARN("Ignoring flags %#"PRIx64".\n", packed_operands);
if (!(ins = sm6_parser_add_function_instruction(sm6, state)))
return;
state->pushed_instruction = true;
sm6_parser_declare_indexable_temp(sm6, elem_type, type[0]->u.array.count, alignment, true, 0, ins, dst); sm6_parser_declare_indexable_temp(sm6, elem_type, type[0]->u.array.count, alignment, true, 0, ins, dst);
} }
@@ -8562,7 +8584,8 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6,
if (record->attachment) if (record->attachment)
metadata_attachment_record_apply(record->attachment, record->code, ins, dst, sm6); metadata_attachment_record_apply(record->attachment, record->code, ins, dst, sm6);
function->instructions.count += ins->opcode != VSIR_OP_NOP; if (!state.pushed_instruction)
function->instructions.count += ins->opcode != VSIR_OP_NOP;
if (is_terminator) if (is_terminator)
{ {