OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: Add missing Flat decorations on some inputs.

Browse Source 
Fixes validation failures:

Test case 'dEQP-GLES31.functional.android_extension_pack.shaders.es32.extension_directive.oes_sample_variables'..
MESA: error: Validation Error: [
UNASSIGNED-CoreValidation-Shader-InconsistentSpirv ] Object 0: handle =
0x563a1838b790, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0x6bbb14 |
SPIR-V module not valid: [VUID-StandaloneSpirv-Flat-04744] Fragment
OpEntryPoint operand 31 with Input interfaces with integer or float type
must have a Flat decoration for Entry Point id 4.
%gl_SampleId = OpVariable %_ptr_Input_uint Input

Test case 'KHR-GL46.shader_ballot_tests.ShaderBallotAvailability'..
MESA: error: Validation Error: [ UNASSIGNED-CoreValidation-Shader-InconsistentSpirv ] Object 0: handle = 0x5558e12f17e0, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0x6bbb14 | SPIR-V module not valid: [VUID-StandaloneSpirv-Flat-04744] Fragment OpEntryPoint operand 28 with Input interfaces with integer or float type must have a Flat decoration for Entry Point id 4.
  %gl_SubgroupLocalInvocationId = OpVariable %_ptr_Input_uint Input

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20756>
This commit is contained in:
Emma Anholt
2023-01-12 14:43:38 -08:00
committed by Marge Bot
parent 7b6a5e3e24
commit 2a33d509ca
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View File

@@ -2733,6 +2733,17 @@ create_builtin_var(struct ntv_context *ctx, SpvId var_type,
spirv_builder_emit_name(&ctx->builder, var, name); spirv_builder_emit_name(&ctx->builder, var, name);
spirv_builder_emit_builtin(&ctx->builder, var, builtin); spirv_builder_emit_builtin(&ctx->builder, var, builtin);
if (ctx->stage == MESA_SHADER_FRAGMENT) {
switch (builtin) {
case SpvBuiltInSampleId:
case SpvBuiltInSubgroupLocalInvocationId:
spirv_builder_emit_decoration(&ctx->builder, var, SpvDecorationFlat);
break;
default:
break;
}
}
assert(ctx->num_entry_ifaces < ARRAY_SIZE(ctx->entry_ifaces)); assert(ctx->num_entry_ifaces < ARRAY_SIZE(ctx->entry_ifaces));
ctx->entry_ifaces[ctx->num_entry_ifaces++] = var; ctx->entry_ifaces[ctx->num_entry_ifaces++] = var;
return var; return var;