Mesa (staging/20.2): spirv: Only require bare types to match when copying variables
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 18 17:43:33 UTC 2020
Module: Mesa
Branch: staging/20.2
Commit: 522e62ac5b31f2be576cb80fd364353250f68aba
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=522e62ac5b31f2be576cb80fd364353250f68aba
Author: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Date: Mon Aug 17 12:02:22 2020 +0300
spirv: Only require bare types to match when copying variables
OpCopyMemory doesn't care about mismatched decorations, only about
matching types.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3418
Fixes: bf1a1eed882980a1cd08482386e3a001ce64a5a4
Signed-off-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6344>
(cherry picked from commit b6ebf6eba958651321a8e332677877c0fe7ee7ec)
---
.pick_status.json | 2 +-
src/compiler/spirv/vtn_variables.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 526d5be634d..a90bdbba9cb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -112,7 +112,7 @@
"description": "spirv: Only require bare types to match when copying variables",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "bf1a1eed882980a1cd08482386e3a001ce64a5a4"
},
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 5f09857a9c8..47932f0cd16 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1155,7 +1155,8 @@ static void
_vtn_variable_copy(struct vtn_builder *b, struct vtn_pointer *dest,
struct vtn_pointer *src)
{
- vtn_assert(src->type->type == dest->type->type);
+ vtn_assert(glsl_get_bare_type(src->type->type) ==
+ glsl_get_bare_type(dest->type->type));
enum glsl_base_type base_type = glsl_get_base_type(src->type->type);
switch (base_type) {
case GLSL_TYPE_UINT:
More information about the mesa-commit
mailing list