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

spirv: Do more complex unwrapping in get_nir_type

Browse source 
The OpenGL flavor of SPIR-V allows for samplers inside structs.  This
means that our simple array-of-array handling isn't sufficient and we
need something substantially more complex for generating NIR types.

Fixes: 14a12b771d "spirv: Rework our handling of images and samplers"
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6065>
This commit is contained in:
Jason Ekstrand 2020-07-24 10:46:20 -05:00
parent 140a5492e0
commit 4816f6f8d8
1 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/compiler/spirv/spirv_to_nir.c
View file

@ -787,13 +787,55 @@ vtn_type_get_nir_type(struct vtn_builder *b, struct vtn_type *type,
}
if (mode == vtn_variable_mode_uniform) {
struct vtn_type *tail = vtn_type_without_array(type);
if (tail->base_type == vtn_base_type_image) {
return wrap_type_in_array(tail->glsl_image, type->type);
} else if (tail->base_type == vtn_base_type_sampler) {
return wrap_type_in_array(glsl_bare_sampler_type(), type->type);
} else if (tail->base_type == vtn_base_type_sampled_image) {
return wrap_type_in_array(tail->image->glsl_image, type->type);
switch (type->base_type) {
case vtn_base_type_array: {
const struct glsl_type *elem_type =
vtn_type_get_nir_type(b, type->array_element, mode);
return glsl_array_type(elem_type, type->length,
glsl_get_explicit_stride(type->type));
}
case vtn_base_type_struct: {
bool need_new_struct = false;
const uint32_t num_fields = type->length;
NIR_VLA(struct glsl_struct_field, fields, num_fields);
for (unsigned i = 0; i < num_fields; i++) {
fields[i] = *glsl_get_struct_field_data(type->type, i);
const struct glsl_type *field_nir_type =
vtn_type_get_nir_type(b, type->members[i], mode);
if (fields[i].type != field_nir_type) {
fields[i].type = field_nir_type;
need_new_struct = true;
}
}
if (need_new_struct) {
if (glsl_type_is_interface(type->type)) {
return glsl_interface_type(fields, num_fields,
/* packing */ 0, false,
glsl_get_type_name(type->type));
} else {
return glsl_struct_type(fields, num_fields,
glsl_get_type_name(type->type),
glsl_struct_type_is_packed(type->type));
}
} else {
/* No changes, just pass it on */
return type->type;
}
}
case vtn_base_type_image:
return type->glsl_image;
case vtn_base_type_sampler:
return glsl_bare_sampler_type();
case vtn_base_type_sampled_image:
return type->image->glsl_image;
default:
return type->type;
}
}