fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 11:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl_type: Simplify glsl_channel_type

Browse source 
This is C++ so we can just poke at the fields of glsl_type if we wish
and calling get_instance is way easier and more reliable than handling
each instance separately.  While we're at it, we re-arrange the base
type labels to match the enum order and add 8-bit type support.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand 2018-12-12 15:25:47 -06:00 • committed by Jason Ekstrand
parent d8a11bfc08
commit 7f70b3e555
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/compiler/nir_types.cpp
View file

@ -493,31 +493,22 @@ glsl_transposed_type(const struct glsl_type *type)
const glsl_type *
glsl_channel_type(const glsl_type *t)
{
switch (glsl_get_base_type(t)) {
case GLSL_TYPE_ARRAY: {
const glsl_type *base = glsl_channel_type(glsl_get_array_element(t));
return glsl_array_type(base, glsl_get_length(t));
}
switch (t->base_type) {
case GLSL_TYPE_ARRAY:
return glsl_array_type(glsl_channel_type(t->fields.array), t->length);
case GLSL_TYPE_UINT:
return glsl_uint_type();
case GLSL_TYPE_INT:
return glsl_int_type();
case GLSL_TYPE_FLOAT:
return glsl_float_type();
case GLSL_TYPE_BOOL:
return glsl_bool_type();
case GLSL_TYPE_DOUBLE:
return glsl_double_type();
case GLSL_TYPE_UINT64:
return glsl_uint64_t_type();
case GLSL_TYPE_INT64:
return glsl_int64_t_type();
case GLSL_TYPE_FLOAT16:
return glsl_float16_t_type();
case GLSL_TYPE_DOUBLE:
case GLSL_TYPE_UINT8:
case GLSL_TYPE_INT8:
case GLSL_TYPE_UINT16:
return glsl_uint16_t_type();
case GLSL_TYPE_INT16:
return glsl_int16_t_type();
case GLSL_TYPE_UINT64:
case GLSL_TYPE_INT64:
case GLSL_TYPE_BOOL:
return glsl_type::get_instance(t->base_type, 1, 1);
default:
unreachable("Unhandled base type glsl_channel_type()");
}