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/spirv: Do not emit function code before the main prolog.

Browse Source
This commit is contained in:
Conor McCarthy 2024-01-12 12:54:05 +10:00 committed by Alexandre Julliard
parent b4b2b0d3ac
commit d402804851
Notes: Alexandre Julliard 2024-01-17 22:42:55 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/450
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2334,7 +2334,9 @@ struct spirv_compiler
const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info; const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info;
unsigned int input_control_point_count; unsigned int input_control_point_count;
unsigned int output_control_point_count; unsigned int output_control_point_count;
bool use_vocp; bool use_vocp;
bool emit_point_size;
enum vkd3d_shader_opcode phase; enum vkd3d_shader_opcode phase;
bool emit_default_control_point_phase; bool emit_default_control_point_phase;
@ -2530,6 +2532,8 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve
if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO)))
{ {
compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO); compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO);
compiler->emit_point_size = compiler->xfb_info && compiler->xfb_info->element_count
&& compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY;
compiler->shader_interface = *shader_interface; compiler->shader_interface = *shader_interface;
if (shader_interface->push_constant_buffer_count) if (shader_interface->push_constant_buffer_count)
@ -6332,7 +6336,7 @@ static void spirv_compiler_emit_dcl_output_topology(struct spirv_compiler *compi
{ {
case VKD3D_PT_POINTLIST: case VKD3D_PT_POINTLIST:
mode = SpvExecutionModeOutputPoints; mode = SpvExecutionModeOutputPoints;
spirv_compiler_emit_point_size(compiler); compiler->emit_point_size = true;
break; break;
case VKD3D_PT_LINESTRIP: case VKD3D_PT_LINESTRIP:
mode = SpvExecutionModeOutputLineStrip; mode = SpvExecutionModeOutputLineStrip;
@ -9220,8 +9224,7 @@ static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler)
{ {
spirv_compiler_emit_push_constant_buffers(compiler); spirv_compiler_emit_push_constant_buffers(compiler);
if (compiler->xfb_info && compiler->xfb_info->element_count if (compiler->emit_point_size)
&& compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY)
spirv_compiler_emit_point_size(compiler); spirv_compiler_emit_point_size(compiler);
} }