nir/spirv: Add a vtn_untyped_value helper

diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c
index abcdd66a4f741c65d99fd440e49bbdab5d55d3fe..a71119fe524b77a561412ce35c2bd13527513e82 100644 (file)
--- a/src/glsl/nir/spirv_to_nir.c
+++ b/src/glsl/nir/spirv_to_nir.c
@@ -92,14 +92,21 @@ vtn_push_value(struct vtn_builder *b, uint32_t value_id,
 }
 
 static struct vtn_value *
-vtn_value(struct vtn_builder *b, uint32_t value_id,
-          enum vtn_value_type value_type)
+vtn_untyped_value(struct vtn_builder *b, uint32_t value_id)
 {
    assert(value_id < b->value_id_bound);
-   assert(b->values[value_id].value_type == value_type);
    return &b->values[value_id];
 }
 
+static struct vtn_value *
+vtn_value(struct vtn_builder *b, uint32_t value_id,
+          enum vtn_value_type value_type)
+{
+   struct vtn_value *val = vtn_untyped_value(b, value_id);
+   assert(val->value_type == value_type);
+   return val;
+}
+
 static char *
 vtn_string_literal(struct vtn_builder *b, const uint32_t *words,
                    unsigned word_count)