fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-13 13:20:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: handle bo struct types that are just a runtime array

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12634>
This commit is contained in:
Mike Blumenkrantz 2021-08-05 14:04:49 -04:00 • committed by Marge Bot
parent efc4e577ed
commit 5ce3fa0100
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -891,14 +891,18 @@ get_bo_array_type(struct ntv_context *ctx, struct nir_variable *var, unsigned bi
{
assert(bitsize);
SpvId array_type;
SpvId uint_type = spirv_builder_type_uint(&ctx->builder, bitsize);
if (glsl_type_is_unsized_array(var->type)) {
array_type = spirv_builder_type_runtime_array(&ctx->builder, uint_type);
spirv_builder_emit_array_stride(&ctx->builder, array_type, bitsize / 8);
} else {
uint32_t array_size = glsl_get_length(glsl_get_struct_field(var->interface_type, 0)) * (bitsize / 4);
array_type = get_sized_uint_array_type(ctx, array_size, bitsize);
const struct glsl_type *type = var->type;
if (!glsl_type_is_unsized_array(type)) {
type = glsl_get_struct_field(var->interface_type, 0);
if (!glsl_type_is_unsized_array(type)) {
uint32_t array_size = glsl_get_length(type) * (bitsize / 4);
assert(array_size);
return get_sized_uint_array_type(ctx, array_size, bitsize);
}
}
SpvId uint_type = spirv_builder_type_uint(&ctx->builder, bitsize);
array_type = spirv_builder_type_runtime_array(&ctx->builder, uint_type);
spirv_builder_emit_array_stride(&ctx->builder, array_type, bitsize / 8);
return array_type;
}
@ -910,7 +914,7 @@ get_bo_struct_type(struct ntv_context *ctx, struct nir_variable *var, unsigned b
// wrap UBO-array in a struct
SpvId runtime_array = 0;
if (ssbo) {
if (ssbo && glsl_get_length(var->interface_type) > 1) {
const struct glsl_type *last_member = glsl_get_struct_field(var->interface_type, glsl_get_length(var->interface_type) - 1);
if (glsl_type_is_unsized_array(last_member)) {
bool is_64bit = glsl_type_is_64bit(glsl_without_array(last_member));