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: Decorate non-float32 non-built-in pixel shader inputs as Flat.

Browse Source 
As per VUID-StandaloneSpirv-Flat-04744. Not strictly a regression, but
revealed by 66cb2815f because it declares unused inputs.
This commit is contained in:
Conor McCarthy 2023-12-19 13:50:46 +10:00 committed by Alexandre Julliard
parent cca03d1c0e
commit 78343dcf87
Notes: Alexandre Julliard 2024-01-02 23:09:56 +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/529
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4298,14 +4298,18 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler,
} }
static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler *compiler, static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler *compiler,
uint32_t id, enum vkd3d_shader_interpolation_mode mode) enum vkd3d_shader_component_type component_type, uint32_t id, enum vkd3d_shader_interpolation_mode mode)
{ {
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
switch (mode) switch (mode)
{ {
case VKD3DSIM_NONE: case VKD3DSIM_NONE:
break; /* VUID-StandaloneSpirv-Flat-04744: integer or double types must be
* decorated 'Flat' for fragment shaders. */
if (compiler->shader_type != VKD3D_SHADER_TYPE_PIXEL || component_type == VKD3D_SHADER_COMPONENT_FLOAT)
break;
/* fall through */
case VKD3DSIM_CONSTANT: case VKD3DSIM_CONSTANT:
vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0);
break; break;
@ -4901,7 +4905,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler,
if (component_idx) if (component_idx)
vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx);
spirv_compiler_emit_interpolation_decorations(compiler, input_id, signature_element->interpolation_mode); spirv_compiler_emit_interpolation_decorations(compiler, component_type, input_id,
signature_element->interpolation_mode);
} }
var_id = input_id; var_id = input_id;