wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Ensure that the OpLabel emitted vkd3d_spirv_builder_begin_main_function() gets terminated.

Browse Source
This commit is contained in:
Jan Sikorski
2023-05-25 10:12:35 +02:00
committed by Alexandre Julliard
parent b453a0acd6
commit bb680e73de
Notes: Alexandre Julliard 2023-05-26 22:19:19 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/212
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d-shader/spirv.c
View File

@ -2244,6 +2244,7 @@ struct spirv_compiler
struct vkd3d_push_constant_buffer_binding *push_constants; struct vkd3d_push_constant_buffer_binding *push_constants;
const struct vkd3d_shader_spirv_target_info *spirv_target_info; const struct vkd3d_shader_spirv_target_info *spirv_target_info;
bool main_block_open;
bool after_declarations_section; bool after_declarations_section;
struct shader_signature input_signature; struct shader_signature input_signature;
struct shader_signature output_signature; struct shader_signature output_signature;
@ -5211,6 +5212,7 @@ static void spirv_compiler_emit_initial_declarations(struct spirv_compiler *comp
if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL)
{ {
vkd3d_spirv_builder_begin_main_function(builder); vkd3d_spirv_builder_begin_main_function(builder);
compiler->main_block_open = true;
} }
} }
@ -7509,6 +7511,8 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c
if (cf_info) if (cf_info)
cf_info->inside_block = false; cf_info->inside_block = false;
else
compiler->main_block_open = false;
break; break;
case VKD3DSIH_RETP: case VKD3DSIH_RETP:
@ -9469,6 +9473,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
if (result < 0) if (result < 0)
return result; return result;
if (compiler->main_block_open)
vkd3d_spirv_build_op_return(builder);
if (!is_in_default_phase(compiler)) if (!is_in_default_phase(compiler))
spirv_compiler_leave_shader_phase(compiler); spirv_compiler_leave_shader_phase(compiler);
else else