From ec686ff62c840e8a5766f1c9dc80f09cba8af73a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Mon, 21 Nov 2016 16:33:08 +0100 Subject: [PATCH] spirv: add DF support to SpvOp*ConstantComposite MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2 (Jason): - Add assert. Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Jason Ekstrand --- src/compiler/spirv/spirv_to_nir.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 594569d8fa7..b44b8e823d2 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -1033,6 +1033,8 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, case GLSL_TYPE_INT: case GLSL_TYPE_FLOAT: case GLSL_TYPE_BOOL: + case GLSL_TYPE_DOUBLE: { + int bit_size = glsl_get_bit_size(val->const_type); if (glsl_type_is_matrix(val->const_type)) { assert(glsl_get_matrix_columns(val->const_type) == elem_count); for (unsigned i = 0; i < elem_count; i++) @@ -1040,12 +1042,18 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, } else { assert(glsl_type_is_vector(val->const_type)); assert(glsl_get_vector_elements(val->const_type) == elem_count); - for (unsigned i = 0; i < elem_count; i++) - val->constant->values[0].u32[i] = elems[i]->values[0].u32[0]; + for (unsigned i = 0; i < elem_count; i++) { + if (bit_size == 64) { + val->constant->values[0].u64[i] = elems[i]->values[0].u64[0]; + } else { + assert(bit_size == 32); + val->constant->values[0].u32[i] = elems[i]->values[0].u32[0]; + } + } } ralloc_free(elems); break; - + } case GLSL_TYPE_STRUCT: case GLSL_TYPE_ARRAY: ralloc_steal(val->constant, elems); -- 2.30.2