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: Always ensure a RET at the end of a program.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-10-28 10:42:35 -05:00 committed by Henri Verbeet
parent 568776bbf6
commit 61bda1c054
Notes: Henri Verbeet 2024-11-04 17:11:05 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1236
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,6 +789,23 @@ static void shader_instruction_eliminate_phase_instance_id(struct vkd3d_shader_i
shader_register_eliminate_phase_addressing(&ins->dst[i].reg, instance_id); shader_register_eliminate_phase_addressing(&ins->dst[i].reg, instance_id);
} }
/* Ensure that the program closes with a ret. sm1 programs do not, by default.
* Many of our IR passes rely on this in order to insert instructions at the
* end of execution. */
static enum vkd3d_result vsir_program_ensure_ret(struct vsir_program *program,
struct vsir_transformation_context *ctx)
{
static const struct vkd3d_shader_location no_loc;
if (program->instructions.count
&& program->instructions.elements[program->instructions.count - 1].opcode == VKD3DSIH_RET)
return VKD3D_OK;
if (!shader_instruction_array_insert_at(&program->instructions, program->instructions.count, 1))
return VKD3D_ERROR_OUT_OF_MEMORY;
vsir_instruction_init(&program->instructions.elements[program->instructions.count - 1], &no_loc, VKD3DSIH_RET);
return VKD3D_OK;
}
static const struct vkd3d_shader_varying_map *find_varying_map( static const struct vkd3d_shader_varying_map *find_varying_map(
const struct vkd3d_shader_varying_map_info *varying_map, unsigned int signature_idx) const struct vkd3d_shader_varying_map_info *varying_map, unsigned int signature_idx)
{ {
@ -2490,15 +2507,14 @@ static void VKD3D_PRINTF_FUNC(3, 4) cf_flattener_create_block_name(struct cf_fla
static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener, static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener,
struct vkd3d_shader_message_context *message_context) struct vkd3d_shader_message_context *message_context)
{ {
bool main_block_open, is_hull_shader, after_declarations_section;
struct vkd3d_shader_instruction_array *instructions; struct vkd3d_shader_instruction_array *instructions;
struct vsir_program *program = flattener->program; struct vsir_program *program = flattener->program;
bool is_hull_shader, after_declarations_section;
struct vkd3d_shader_instruction *dst_ins; struct vkd3d_shader_instruction *dst_ins;
size_t i; size_t i;
instructions = &program->instructions; instructions = &program->instructions;
is_hull_shader = program->shader_version.type == VKD3D_SHADER_TYPE_HULL; is_hull_shader = program->shader_version.type == VKD3D_SHADER_TYPE_HULL;
main_block_open = !is_hull_shader;
after_declarations_section = is_hull_shader; after_declarations_section = is_hull_shader;
if (!cf_flattener_require_space(flattener, instructions->count + 1)) if (!cf_flattener_require_space(flattener, instructions->count + 1))
@ -2822,8 +2838,6 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte
if (cf_info) if (cf_info)
cf_info->inside_block = false; cf_info->inside_block = false;
else
main_block_open = false;
break; break;
default: default:
@ -2833,14 +2847,6 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte
} }
} }
if (main_block_open)
{
if (!(dst_ins = cf_flattener_require_space(flattener, 1)))
return VKD3D_ERROR_OUT_OF_MEMORY;
vsir_instruction_init(dst_ins, &flattener->location, VKD3DSIH_RET);
++flattener->instruction_count;
}
return flattener->status; return flattener->status;
} }
@ -8012,6 +8018,8 @@ enum vkd3d_result vsir_program_transform(struct vsir_program *program, uint64_t
} }
else else
{ {
vsir_transform(&ctx, vsir_program_ensure_ret);
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);