spirv: Remove outdated SPIR-V decoration warnings
authorArcady Goldmints-Orlov <agoldmints@igalia.com>
Fri, 21 Feb 2020 18:47:10 +0000 (12:47 -0600)
committerMarge Bot <eric+marge@anholt.net>
Fri, 21 Feb 2020 20:34:03 +0000 (20:34 +0000)
spirv_to_nir warns if it encounters XFB decorations and errors if
it encounters a Stream decoration with value other than 0, despite
the fact that these decorations are in fact handled correctly.

Fixes dEQP-VK.transform_feedback.simple.query_1_*
Fixes: cd4a14be06 "spirv: Handle XFB variable decorations"
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3910>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3910>

src/compiler/spirv/spirv_to_nir.c

index a3b9c5f6c7ebc008ba2a4646a7f2c7c01651d0fb..822e3289b65ec0644d090312a7502c2e0158bff1 100644 (file)
@@ -793,8 +793,7 @@ struct_member_decoration_cb(struct vtn_builder *b,
       ctx->fields[member].sample = true;
       break;
    case SpvDecorationStream:
-      /* Vulkan only allows one GS stream */
-      vtn_assert(dec->operands[0] == 0);
+      /* This is handled later by var_decoration_cb in vtn_variables.c */
       break;
    case SpvDecorationLocation:
       ctx->fields[member].location = dec->operands[0];
@@ -845,7 +844,7 @@ struct_member_decoration_cb(struct vtn_builder *b,
 
    case SpvDecorationXfbBuffer:
    case SpvDecorationXfbStride:
-      vtn_warn("Vulkan does not have transform feedback");
+      /* This is handled later by var_decoration_cb in vtn_variables.c */
       break;
 
    case SpvDecorationCPacked: