diff options
| author | Rob Clark <[email protected]> | 2016-05-11 15:05:09 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2016-05-12 13:39:40 -0400 |
| commit | 9d3cc80b752b236bc51b78a3d99920748a1a230a (patch) | |
| tree | c518c99153ecd2af941e400d47383ac90e9632cf /src/compiler/spirv | |
| parent | b19cff1639f9c6e3074d11f1199807603046ea4b (diff) | |
nir: glsl_get_bit_size() should take glsl_type
It's what all the call-sites once, so gets rid of a bunch of inlined
glsl_get_base_type() at the call-sites.
Signed-off-by: Rob Clark <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/compiler/spirv')
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 6 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 8d4f771364f..c65f971ad79 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -38,7 +38,7 @@ vtn_undef_ssa_value(struct vtn_builder *b, const struct glsl_type *type) if (glsl_type_is_vector_or_scalar(type)) { unsigned num_components = glsl_get_vector_elements(val->type); - unsigned bit_size = glsl_get_bit_size(glsl_get_base_type(val->type)); + unsigned bit_size = glsl_get_bit_size(val->type); val->def = nir_ssa_undef(&b->nb, num_components, bit_size); } else { unsigned elems = glsl_get_length(val->type); @@ -1034,7 +1034,7 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, unsigned num_components = glsl_get_vector_elements(val->const_type); unsigned bit_size = - glsl_get_bit_size(glsl_get_base_type(val->const_type)); + glsl_get_bit_size(val->const_type); nir_const_value src[3]; assert(count <= 7); @@ -1783,7 +1783,7 @@ vtn_ssa_transpose(struct vtn_builder *b, struct vtn_ssa_value *src) for (unsigned i = 0; i < glsl_get_matrix_columns(dest->type); i++) { nir_alu_instr *vec = create_vec(b->shader, glsl_get_matrix_columns(src->type), - glsl_get_bit_size(glsl_get_base_type(src->type))); + glsl_get_bit_size(src->type)); if (glsl_type_is_vector_or_scalar(src->type)) { vec->src[0].src = nir_src_for_ssa(src->def); vec->src[0].swizzle[0] = i; diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index d2f174c90b9..bbe1166aff0 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -191,7 +191,7 @@ _vtn_local_load_store(struct vtn_builder *b, bool load, nir_deref_var *deref, if (load) { nir_ssa_dest_init(&intrin->instr, &intrin->dest, intrin->num_components, - glsl_get_bit_size(glsl_get_base_type(tail->type)), + glsl_get_bit_size(tail->type), NULL); inout->def = &intrin->dest.ssa; } else { @@ -414,7 +414,7 @@ _vtn_load_store_tail(struct vtn_builder *b, nir_intrinsic_op op, bool load, if (load) { nir_ssa_dest_init(&instr->instr, &instr->dest, instr->num_components, - glsl_get_bit_size(glsl_get_base_type(type)), NULL); + glsl_get_bit_size(type), NULL); (*inout)->def = &instr->dest.ssa; } |