<div dir="ltr"><div>1, 2, 3, and 6 are</div><div><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, Jul 11, 2018 at 2:30 PM Karol Herbst <<a href="mailto:kherbst@redhat.com">kherbst@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Karol Herbst <<a href="mailto:kherbst@redhat.com" target="_blank">kherbst@redhat.com</a>><br>
---<br>
src/compiler/spirv/spirv_to_nir.c | 15 +++++++++++++--<br>
1 file changed, 13 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c<br>
index 413fbf481c1..235003e872a 100644<br>
--- a/src/compiler/spirv/spirv_to_nir.c<br>
+++ b/src/compiler/spirv/spirv_to_nir.c<br>
@@ -1494,8 +1494,19 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,<br>
spirv_op_to_string(opcode), elem_count, val->type->length);<br>
<br>
nir_constant **elems = ralloc_array(b, nir_constant *, elem_count);<br>
- for (unsigned i = 0; i < elem_count; i++)<br>
- elems[i] = vtn_value(b, w[i + 3], vtn_value_type_constant)->constant;<br>
+ for (unsigned i = 0; i < elem_count; i++) {<br>
+ struct vtn_value *val = vtn_untyped_value(b, w[i + 3]);<br>
+<br>
+ if (val->value_type == vtn_value_type_constant) {<br>
+ elems[i] = val->constant;<br>
+ } else {<br>
+ vtn_fail_if(val->value_type != vtn_value_type_undef,<br>
+ "only constants or undefs allowed for "<br>
+ "SpvOpConstantComposite");<br>
+ /* to make it easier, just insert a NULL constant for now */<br>
+ elems[i] = vtn_null_constant(b, val->type->type);<br>
+ }<br>
+ }<br>
<br>
switch (val->type->base_type) {<br>
case vtn_base_type_vector: {<br>
-- <br>
2.17.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>