Mesa (master): spirv: Remove outdated SPIR-V decoration warnings
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Feb 21 20:56:13 UTC 2020
Module: Mesa
Branch: master
Commit: 5f3cbbd958d14924dded0e0a0908127f6bfa006d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f3cbbd958d14924dded0e0a0908127f6bfa006d
Author: Arcady Goldmints-Orlov <agoldmints at igalia.com>
Date: Fri Feb 21 12:47:10 2020 -0600
spirv: Remove outdated SPIR-V decoration warnings
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 at 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 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index a3b9c5f6c7e..822e3289b65 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -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:
More information about the mesa-commit
mailing list