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/ir: Run validation after flattening hull shader phases.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-05 17:19:12 +02:00 committed by Henri Verbeet
parent 5fd93c28c4
commit a3fdc447de
Notes: Henri Verbeet 2024-09-10 21:57:30 +02:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1049
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -864,9 +864,10 @@ static bool vsir_instruction_init_label(struct vkd3d_shader_instruction *ins,
return true; return true;
} }
static enum vkd3d_result instruction_array_flatten_hull_shader_phases(struct vkd3d_shader_instruction_array *src_instructions) static enum vkd3d_result vsir_program_flatten_hull_shader_phases(struct vsir_program *program,
struct vsir_normalisation_context *ctx)
{ {
struct hull_flattener flattener = {*src_instructions}; struct hull_flattener flattener = {program->instructions};
struct vkd3d_shader_instruction_array *instructions; struct vkd3d_shader_instruction_array *instructions;
struct shader_phase_location_array locations; struct shader_phase_location_array locations;
enum vkd3d_result result = VKD3D_OK; enum vkd3d_result result = VKD3D_OK;
@ -888,7 +889,7 @@ static enum vkd3d_result instruction_array_flatten_hull_shader_phases(struct vkd
vsir_instruction_init(&instructions->elements[instructions->count++], &flattener.last_ret_location, VKD3DSIH_RET); vsir_instruction_init(&instructions->elements[instructions->count++], &flattener.last_ret_location, VKD3DSIH_RET);
} }
*src_instructions = flattener.instructions; program->instructions = flattener.instructions;
return result; return result;
} }
@ -6662,18 +6663,22 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL) if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL)
vsir_transform(&ctx, vsir_program_remap_output_signature); vsir_transform(&ctx, vsir_program_remap_output_signature);
if (ctx.result < 0)
return ctx.result;
if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL)
{ {
if ((result = instruction_array_flatten_hull_shader_phases(&program->instructions)) < 0) vsir_transform(&ctx, vsir_program_flatten_hull_shader_phases);
return result;
if (ctx.result < 0)
return ctx.result;
if ((result = instruction_array_normalise_hull_shader_control_point_io(&program->instructions, if ((result = instruction_array_normalise_hull_shader_control_point_io(&program->instructions,
&program->input_signature)) < 0) &program->input_signature)) < 0)
return result; return result;
} }
else
{
if (ctx.result < 0)
return ctx.result;
}
if ((result = vsir_program_normalise_io_registers(program, message_context)) < 0) if ((result = vsir_program_normalise_io_registers(program, message_context)) < 0)
return result; return result;