summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDanylo Piliaiev <danylo.piliaiev@globallogic.com>2020-08-17 12:02:22 +0300
committerEric Engestrom <eric@engestrom.ch>2020-08-19 22:28:30 +0200
commit1b470ee09fdcecdd0c62d7907ed18eed4ddbb196 (patch)
tree896070649f92a3477577b60e4179e9f2013f921e /src
parent790af092d804a36f32025ba0d06a6a77db4d17fe (diff)
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@globallogic.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6344> (cherry picked from commit b6ebf6eba958651321a8e332677877c0fe7ee7ec)
Diffstat (limited to 'src')
-rw-r--r--src/compiler/spirv/vtn_variables.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 00743d6552c..93c4e004ab1 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1182,7 +1182,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: