fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

spirv: Remove outdated SPIR-V decoration warnings

Browse source 
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>
(cherry picked from commit 5f3cbbd958)
This commit is contained in:
Arcady Goldmints-Orlov 2020-02-21 12:47:10 -06:00 • committed by Dylan Baker
parent 46b7b11cbf
commit 4e699a34ae
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -400,7 +400,7 @@
"description": "spirv: Remove outdated SPIR-V decoration warnings",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "cd4a14be063957964ae54e0e828174b9e40961e0"
},

5
src/compiler/spirv/spirv_to_nir.c
View file

@ -776,8 +776,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];
@ -828,7 +827,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: