From 23ffb7c2d17f0268b209782a46e6cb838bd63585 Mon Sep 17 00:00:00 2001 From: Jose Maria Casanova Crespo Date: Thu, 22 Feb 2018 17:36:37 +0100 Subject: [PATCH] spirv: Calculate properly 16-bit vector sizes Range in 16-bit push constants load was being calculated wrongly using 4-bytes per element instead of 2-bytes as it should be. v2: Use glsl_get_bit_size instead of if statement (Jason Ekstrand) Reviewed-by: Jason Ekstrand --- src/compiler/spirv/vtn_variables.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 9eb85c24e95..105b33a5671 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -683,12 +683,9 @@ vtn_type_block_size(struct vtn_builder *b, struct vtn_type *type) if (cols > 1) { vtn_assert(type->stride > 0); return type->stride * cols; - } else if (base_type == GLSL_TYPE_DOUBLE || - base_type == GLSL_TYPE_UINT64 || - base_type == GLSL_TYPE_INT64) { - return glsl_get_vector_elements(type->type) * 8; } else { - return glsl_get_vector_elements(type->type) * 4; + unsigned type_size = glsl_get_bit_size(type->type) / 8; + return glsl_get_vector_elements(type->type) * type_size; } } -- 2.30.2