From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 9 May 2023 15:51:55 +0000 (-0400)
Subject: vtn: add spirv index to type mismatch error for debugging
X-Git-Tag: upstream/23.3.3~8498
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=684756e1622264e9810a8f2edda0447ac8a418ee;p=platform%2Fupstream%2Fmesa.git

vtn: add spirv index to type mismatch error for debugging

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22932>
---

diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 4cbd667..55bc4b6 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -2266,10 +2266,10 @@ vtn_assert_types_equal(struct vtn_builder *b, SpvOp opcode,
       return;
    }
 
-   vtn_fail("Source and destination types of %s do not match: %s vs. %s",
+   vtn_fail("Source and destination types of %s do not match: %s (%%%u) vs. %s (%%%u)",
             spirv_op_to_string(opcode),
-            glsl_get_type_name(dst_type->type),
-            glsl_get_type_name(src_type->type));
+            glsl_get_type_name(dst_type->type), dst_type->id,
+            glsl_get_type_name(src_type->type), src_type->id);
 }
 
 static nir_ssa_def *