X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fspirv%2Fvtn_variables.c;h=90fcc605a459496f51eae8f3998326a890a28ddb;hb=63b9aa2e257475cdee0a1aafcd57c6f123d6e7e6;hp=11d2aabac8c530486e54caab1967c82767e76800;hpb=c17808562e4ff3bcc3c3755a6b5ffbf86b8624ad;p=mesa.git diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 11d2aabac8c..90fcc605a45 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -27,6 +27,8 @@ #include "vtn_private.h" #include "spirv_info.h" +#include "nir_deref.h" +#include static struct vtn_access_chain * vtn_access_chain_create(struct vtn_builder *b, unsigned length) @@ -42,27 +44,14 @@ vtn_access_chain_create(struct vtn_builder *b, unsigned length) return chain; } -static struct vtn_access_chain * -vtn_access_chain_extend(struct vtn_builder *b, struct vtn_access_chain *old, - unsigned new_ids) -{ - struct vtn_access_chain *chain; - - unsigned old_len = old ? old->length : 0; - chain = vtn_access_chain_create(b, old_len + new_ids); - - for (unsigned i = 0; i < old_len; i++) - chain->link[i] = old->link[i]; - - return chain; -} - -static bool +bool vtn_pointer_uses_ssa_offset(struct vtn_builder *b, struct vtn_pointer *ptr) { - return ptr->mode == vtn_variable_mode_ubo || - ptr->mode == vtn_variable_mode_ssbo || + return ((ptr->mode == vtn_variable_mode_ubo || + ptr->mode == vtn_variable_mode_ssbo) && + b->options->lower_ubo_ssbo_access_to_offsets) || + ptr->mode == vtn_variable_mode_push_constant || (ptr->mode == vtn_variable_mode_workgroup && b->options->lower_workgroup_access_to_offsets); } @@ -78,60 +67,33 @@ vtn_pointer_is_external_block(struct vtn_builder *b, b->options->lower_workgroup_access_to_offsets); } -/* Dereference the given base pointer by the access chain */ -static struct vtn_pointer * -vtn_access_chain_pointer_dereference(struct vtn_builder *b, - struct vtn_pointer *base, - struct vtn_access_chain *deref_chain) -{ - struct vtn_access_chain *chain = - vtn_access_chain_extend(b, base->chain, deref_chain->length); - struct vtn_type *type = base->type; - - /* OpPtrAccessChain is only allowed on things which support variable - * pointers. For everything else, the client is expected to just pass us - * the right access chain. - */ - vtn_assert(!deref_chain->ptr_as_array); - - unsigned start = base->chain ? base->chain->length : 0; - for (unsigned i = 0; i < deref_chain->length; i++) { - chain->link[start + i] = deref_chain->link[i]; - - if (glsl_type_is_struct(type->type)) { - vtn_assert(deref_chain->link[i].mode == vtn_access_mode_literal); - type = type->members[deref_chain->link[i].id]; - } else { - type = type->array_element; - } - } - - struct vtn_pointer *ptr = rzalloc(b, struct vtn_pointer); - ptr->mode = base->mode; - ptr->type = type; - ptr->var = base->var; - ptr->chain = chain; - - return ptr; -} - static nir_ssa_def * vtn_access_link_as_ssa(struct vtn_builder *b, struct vtn_access_link link, - unsigned stride) + unsigned stride, unsigned bit_size) { vtn_assert(stride > 0); if (link.mode == vtn_access_mode_literal) { - return nir_imm_int(&b->nb, link.id * stride); - } else if (stride == 1) { - nir_ssa_def *ssa = vtn_ssa_value(b, link.id)->def; - if (ssa->bit_size != 32) - ssa = nir_u2u32(&b->nb, ssa); - return ssa; + return nir_imm_intN_t(&b->nb, link.id * stride, bit_size); } else { - nir_ssa_def *src0 = vtn_ssa_value(b, link.id)->def; - if (src0->bit_size != 32) - src0 = nir_u2u32(&b->nb, src0); - return nir_imul(&b->nb, src0, nir_imm_int(&b->nb, stride)); + nir_ssa_def *ssa = vtn_ssa_value(b, link.id)->def; + if (ssa->bit_size != bit_size) + ssa = nir_i2i(&b->nb, ssa, bit_size); + if (stride != 1) + ssa = nir_imul_imm(&b->nb, ssa, stride); + return ssa; + } +} + +static VkDescriptorType +vk_desc_type_for_mode(struct vtn_builder *b, enum vtn_variable_mode mode) +{ + switch (mode) { + case vtn_variable_mode_ubo: + return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + case vtn_variable_mode_ssbo: + return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; + default: + vtn_fail("Invalid mode for vulkan_resource_index"); } } @@ -150,6 +112,7 @@ vtn_variable_resource_index(struct vtn_builder *b, struct vtn_variable *var, instr->src[0] = nir_src_for_ssa(desc_array_index); nir_intrinsic_set_desc_set(instr, var->descriptor_set); nir_intrinsic_set_binding(instr, var->binding); + nir_intrinsic_set_desc_type(instr, vk_desc_type_for_mode(b, var->mode)); nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL); nir_builder_instr_insert(&b->nb, &instr->instr); @@ -158,14 +121,15 @@ vtn_variable_resource_index(struct vtn_builder *b, struct vtn_variable *var, } static nir_ssa_def * -vtn_resource_reindex(struct vtn_builder *b, nir_ssa_def *base_index, - nir_ssa_def *offset_index) +vtn_resource_reindex(struct vtn_builder *b, enum vtn_variable_mode mode, + nir_ssa_def *base_index, nir_ssa_def *offset_index) { nir_intrinsic_instr *instr = nir_intrinsic_instr_create(b->nb.shader, nir_intrinsic_vulkan_resource_reindex); instr->src[0] = nir_src_for_ssa(base_index); instr->src[1] = nir_src_for_ssa(offset_index); + nir_intrinsic_set_desc_type(instr, vk_desc_type_for_mode(b, mode)); nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL); nir_builder_instr_insert(&b->nb, &instr->instr); @@ -173,6 +137,182 @@ vtn_resource_reindex(struct vtn_builder *b, nir_ssa_def *base_index, return &instr->dest.ssa; } +static nir_ssa_def * +vtn_descriptor_load(struct vtn_builder *b, enum vtn_variable_mode mode, + const struct glsl_type *desc_type, nir_ssa_def *desc_index) +{ + nir_intrinsic_instr *desc_load = + nir_intrinsic_instr_create(b->nb.shader, + nir_intrinsic_load_vulkan_descriptor); + desc_load->src[0] = nir_src_for_ssa(desc_index); + desc_load->num_components = glsl_get_vector_elements(desc_type); + nir_intrinsic_set_desc_type(desc_load, vk_desc_type_for_mode(b, mode)); + nir_ssa_dest_init(&desc_load->instr, &desc_load->dest, + desc_load->num_components, + glsl_get_bit_size(desc_type), NULL); + nir_builder_instr_insert(&b->nb, &desc_load->instr); + + return &desc_load->dest.ssa; +} + +/* Dereference the given base pointer by the access chain */ +static struct vtn_pointer * +vtn_nir_deref_pointer_dereference(struct vtn_builder *b, + struct vtn_pointer *base, + struct vtn_access_chain *deref_chain) +{ + struct vtn_type *type = base->type; + enum gl_access_qualifier access = base->access; + unsigned idx = 0; + + nir_deref_instr *tail; + if (base->deref) { + tail = base->deref; + } else if (vtn_pointer_is_external_block(b, base)) { + nir_ssa_def *block_index = base->block_index; + + /* We dereferencing an external block pointer. Correctness of this + * operation relies on one particular line in the SPIR-V spec, section + * entitled "Validation Rules for Shader Capabilities": + * + * "Block and BufferBlock decorations cannot decorate a structure + * type that is nested at any level inside another structure type + * decorated with Block or BufferBlock." + * + * This means that we can detect the point where we cross over from + * descriptor indexing to buffer indexing by looking for the block + * decorated struct type. Anything before the block decorated struct + * type is a descriptor indexing operation and anything after the block + * decorated struct is a buffer offset operation. + */ + + /* Figure out the descriptor array index if any + * + * Some of the Vulkan CTS tests with hand-rolled SPIR-V have been known + * to forget the Block or BufferBlock decoration from time to time. + * It's more robust if we check for both !block_index and for the type + * to contain a block. This way there's a decent chance that arrays of + * UBOs/SSBOs will work correctly even if variable pointers are + * completley toast. + */ + nir_ssa_def *desc_arr_idx = NULL; + if (!block_index || vtn_type_contains_block(b, type)) { + /* If our type contains a block, then we're still outside the block + * and we need to process enough levels of dereferences to get inside + * of it. + */ + if (deref_chain->ptr_as_array) { + unsigned aoa_size = glsl_get_aoa_size(type->type); + desc_arr_idx = vtn_access_link_as_ssa(b, deref_chain->link[idx], + MAX2(aoa_size, 1), 32); + idx++; + } + + for (; idx < deref_chain->length; idx++) { + if (type->base_type != vtn_base_type_array) { + vtn_assert(type->base_type == vtn_base_type_struct); + break; + } + + unsigned aoa_size = glsl_get_aoa_size(type->array_element->type); + nir_ssa_def *arr_offset = + vtn_access_link_as_ssa(b, deref_chain->link[idx], + MAX2(aoa_size, 1), 32); + if (desc_arr_idx) + desc_arr_idx = nir_iadd(&b->nb, desc_arr_idx, arr_offset); + else + desc_arr_idx = arr_offset; + + type = type->array_element; + access |= type->access; + } + } + + if (!block_index) { + vtn_assert(base->var && base->type); + block_index = vtn_variable_resource_index(b, base->var, desc_arr_idx); + } else if (desc_arr_idx) { + block_index = vtn_resource_reindex(b, base->mode, + block_index, desc_arr_idx); + } + + if (idx == deref_chain->length) { + /* The entire deref was consumed in finding the block index. Return + * a pointer which just has a block index and a later access chain + * will dereference deeper. + */ + struct vtn_pointer *ptr = rzalloc(b, struct vtn_pointer); + ptr->mode = base->mode; + ptr->type = type; + ptr->block_index = block_index; + ptr->access = access; + return ptr; + } + + /* If we got here, there's more access chain to handle and we have the + * final block index. Insert a descriptor load and cast to a deref to + * start the deref chain. + */ + nir_ssa_def *desc = + vtn_descriptor_load(b, base->mode, base->ptr_type->type, block_index); + + assert(base->mode == vtn_variable_mode_ssbo || + base->mode == vtn_variable_mode_ubo); + nir_variable_mode nir_mode = + base->mode == vtn_variable_mode_ssbo ? nir_var_ssbo : nir_var_ubo; + + tail = nir_build_deref_cast(&b->nb, desc, nir_mode, type->type, + base->ptr_type->stride); + } else { + assert(base->var && base->var->var); + tail = nir_build_deref_var(&b->nb, base->var->var); + if (base->ptr_type && base->ptr_type->type) { + tail->dest.ssa.num_components = + glsl_get_vector_elements(base->ptr_type->type); + tail->dest.ssa.bit_size = glsl_get_bit_size(base->ptr_type->type); + } + } + + if (idx == 0 && deref_chain->ptr_as_array) { + /* We start with a deref cast to get the stride. Hopefully, we'll be + * able to delete that cast eventually. + */ + tail = nir_build_deref_cast(&b->nb, &tail->dest.ssa, tail->mode, + tail->type, base->ptr_type->stride); + + nir_ssa_def *index = vtn_access_link_as_ssa(b, deref_chain->link[0], 1, + tail->dest.ssa.bit_size); + tail = nir_build_deref_ptr_as_array(&b->nb, tail, index); + idx++; + } + + for (; idx < deref_chain->length; idx++) { + if (glsl_type_is_struct(type->type)) { + vtn_assert(deref_chain->link[idx].mode == vtn_access_mode_literal); + unsigned field = deref_chain->link[idx].id; + tail = nir_build_deref_struct(&b->nb, tail, field); + type = type->members[field]; + } else { + nir_ssa_def *arr_index = + vtn_access_link_as_ssa(b, deref_chain->link[idx], 1, + tail->dest.ssa.bit_size); + tail = nir_build_deref_array(&b->nb, tail, arr_index); + type = type->array_element; + } + + access |= type->access; + } + + struct vtn_pointer *ptr = rzalloc(b, struct vtn_pointer); + ptr->mode = base->mode; + ptr->type = type; + ptr->var = base->var; + ptr->deref = tail; + ptr->access = access; + + return ptr; +} + static struct vtn_pointer * vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, struct vtn_pointer *base, @@ -181,6 +321,7 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, nir_ssa_def *block_index = base->block_index; nir_ssa_def *offset = base->offset; struct vtn_type *type = base->type; + enum gl_access_qualifier access = base->access; unsigned idx = 0; if (base->mode == vtn_variable_mode_ubo || @@ -191,10 +332,11 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, if (glsl_type_is_array(type->type)) { if (deref_chain->length >= 1) { desc_arr_idx = - vtn_access_link_as_ssa(b, deref_chain->link[0], 1); + vtn_access_link_as_ssa(b, deref_chain->link[0], 1, 32); idx++; /* This consumes a level of type */ type = type->array_element; + access |= type->access; } else { /* This is annoying. We've been asked for a pointer to the * array of UBOs/SSBOs and not a specifc buffer. Return a @@ -206,7 +348,7 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, } else if (deref_chain->ptr_as_array) { /* You can't have a zero-length OpPtrAccessChain */ vtn_assert(deref_chain->length >= 1); - desc_arr_idx = vtn_access_link_as_ssa(b, deref_chain->link[0], 1); + desc_arr_idx = vtn_access_link_as_ssa(b, deref_chain->link[0], 1, 32); } else { /* We have a regular non-array SSBO. */ desc_arr_idx = NULL; @@ -238,10 +380,11 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, */ vtn_assert(deref_chain->length >= 1); nir_ssa_def *offset_index = - vtn_access_link_as_ssa(b, deref_chain->link[0], 1); + vtn_access_link_as_ssa(b, deref_chain->link[0], 1, 32); idx++; - block_index = vtn_resource_reindex(b, block_index, offset_index); + block_index = vtn_resource_reindex(b, base->mode, + block_index, offset_index); } } @@ -268,6 +411,12 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, } offset = nir_imm_int(&b->nb, base->var->shared_location); + } else if (base->mode == vtn_variable_mode_push_constant) { + /* Push constants neither need nor have a block index */ + vtn_assert(!block_index); + + /* Start off with at the start of the push constant block. */ + offset = nir_imm_int(&b->nb, 0); } else { /* The code above should have ensured a block_index when needed. */ vtn_assert(block_index); @@ -286,7 +435,7 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, nir_ssa_def *elem_offset = vtn_access_link_as_ssa(b, deref_chain->link[idx], - base->ptr_type->stride); + base->ptr_type->stride, offset->bit_size); offset = nir_iadd(&b->nb, offset, elem_offset); idx++; } @@ -297,6 +446,8 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, case GLSL_TYPE_INT: case GLSL_TYPE_UINT16: case GLSL_TYPE_INT16: + case GLSL_TYPE_UINT8: + case GLSL_TYPE_INT8: case GLSL_TYPE_UINT64: case GLSL_TYPE_INT64: case GLSL_TYPE_FLOAT: @@ -305,18 +456,20 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, case GLSL_TYPE_BOOL: case GLSL_TYPE_ARRAY: { nir_ssa_def *elem_offset = - vtn_access_link_as_ssa(b, deref_chain->link[idx], type->stride); + vtn_access_link_as_ssa(b, deref_chain->link[idx], + type->stride, offset->bit_size); offset = nir_iadd(&b->nb, offset, elem_offset); type = type->array_element; + access |= type->access; break; } case GLSL_TYPE_STRUCT: { vtn_assert(deref_chain->link[idx].mode == vtn_access_mode_literal); unsigned member = deref_chain->link[idx].id; - nir_ssa_def *mem_offset = nir_imm_int(&b->nb, type->offsets[member]); - offset = nir_iadd(&b->nb, offset, mem_offset); + offset = nir_iadd_imm(&b->nb, offset, type->offsets[member]); type = type->members[member]; + access |= type->access; break; } @@ -330,6 +483,7 @@ vtn_ssa_offset_pointer_dereference(struct vtn_builder *b, ptr->type = type; ptr->block_index = block_index; ptr->offset = offset; + ptr->access = access; return ptr; } @@ -343,23 +497,7 @@ vtn_pointer_dereference(struct vtn_builder *b, if (vtn_pointer_uses_ssa_offset(b, base)) { return vtn_ssa_offset_pointer_dereference(b, base, deref_chain); } else { - return vtn_access_chain_pointer_dereference(b, base, deref_chain); - } -} - -/* Crawls a chain of array derefs and rewrites the types so that the - * lengths stay the same but the terminal type is the one given by - * tail_type. This is useful for split structures. - */ -static void -rewrite_deref_types(struct vtn_builder *b, nir_deref *deref, - const struct glsl_type *type) -{ - deref->type = type; - if (deref->child) { - vtn_assert(deref->child->deref_type == nir_deref_type_array); - vtn_assert(glsl_type_is_array(deref->type)); - rewrite_deref_types(b, deref->child, glsl_get_array_element(type)); + return vtn_nir_deref_pointer_dereference(b, base, deref_chain); } } @@ -375,160 +513,81 @@ vtn_pointer_for_variable(struct vtn_builder *b, vtn_assert(ptr_type->deref->type == var->type->type); pointer->ptr_type = ptr_type; pointer->var = var; + pointer->access = var->access | var->type->access; return pointer; } -nir_deref_var * -vtn_pointer_to_deref(struct vtn_builder *b, struct vtn_pointer *ptr) +/* Returns an atomic_uint type based on the original uint type. The returned + * type will be equivalent to the original one but will have an atomic_uint + * type as leaf instead of an uint. + * + * Manages uint scalars, arrays, and arrays of arrays of any nested depth. + */ +static const struct glsl_type * +repair_atomic_type(const struct glsl_type *type) { - /* Do on-the-fly copy propagation for samplers. */ - if (ptr->var->copy_prop_sampler) - return vtn_pointer_to_deref(b, ptr->var->copy_prop_sampler); + assert(glsl_get_base_type(glsl_without_array(type)) == GLSL_TYPE_UINT); + assert(glsl_type_is_scalar(glsl_without_array(type))); - nir_deref_var *deref_var; - if (ptr->var->var) { - deref_var = nir_deref_var_create(b, ptr->var->var); - /* Raw variable access */ - if (!ptr->chain) - return deref_var; + if (glsl_type_is_array(type)) { + const struct glsl_type *atomic = + repair_atomic_type(glsl_get_array_element(type)); + + return glsl_array_type(atomic, glsl_get_length(type), + glsl_get_explicit_stride(type)); } else { - vtn_assert(ptr->var->members); - /* Create the deref_var manually. It will get filled out later. */ - deref_var = rzalloc(b, nir_deref_var); - deref_var->deref.deref_type = nir_deref_type_var; + return glsl_atomic_uint_type(); } +} - struct vtn_access_chain *chain = ptr->chain; - vtn_assert(chain); - - struct vtn_type *deref_type = ptr->var->type; - nir_deref *tail = &deref_var->deref; - nir_variable **members = ptr->var->members; - - for (unsigned i = 0; i < chain->length; i++) { - enum glsl_base_type base_type = glsl_get_base_type(deref_type->type); - switch (base_type) { - case GLSL_TYPE_UINT: - case GLSL_TYPE_INT: - case GLSL_TYPE_UINT16: - case GLSL_TYPE_INT16: - case GLSL_TYPE_UINT64: - case GLSL_TYPE_INT64: - case GLSL_TYPE_FLOAT: - case GLSL_TYPE_FLOAT16: - case GLSL_TYPE_DOUBLE: - case GLSL_TYPE_BOOL: - case GLSL_TYPE_ARRAY: { - deref_type = deref_type->array_element; - - nir_deref_array *deref_arr = nir_deref_array_create(b); - deref_arr->deref.type = deref_type->type; - - if (chain->link[i].mode == vtn_access_mode_literal) { - deref_arr->deref_array_type = nir_deref_array_type_direct; - deref_arr->base_offset = chain->link[i].id; - } else { - vtn_assert(chain->link[i].mode == vtn_access_mode_id); - deref_arr->deref_array_type = nir_deref_array_type_indirect; - deref_arr->base_offset = 0; - deref_arr->indirect = - nir_src_for_ssa(vtn_ssa_value(b, chain->link[i].id)->def); - } - tail->child = &deref_arr->deref; - tail = tail->child; - break; - } +nir_deref_instr * +vtn_pointer_to_deref(struct vtn_builder *b, struct vtn_pointer *ptr) +{ + /* Do on-the-fly copy propagation for samplers. */ + if (ptr->var && ptr->var->copy_prop_sampler) + return vtn_pointer_to_deref(b, ptr->var->copy_prop_sampler); - case GLSL_TYPE_STRUCT: { - vtn_assert(chain->link[i].mode == vtn_access_mode_literal); - unsigned idx = chain->link[i].id; - deref_type = deref_type->members[idx]; - if (members) { - /* This is a pre-split structure. */ - deref_var->var = members[idx]; - rewrite_deref_types(b, &deref_var->deref, members[idx]->type); - vtn_assert(tail->type == deref_type->type); - members = NULL; - } else { - nir_deref_struct *deref_struct = nir_deref_struct_create(b, idx); - deref_struct->deref.type = deref_type->type; - tail->child = &deref_struct->deref; - tail = tail->child; - } - break; - } - default: - vtn_fail("Invalid type for deref"); - } + vtn_assert(!vtn_pointer_uses_ssa_offset(b, ptr)); + if (!ptr->deref) { + struct vtn_access_chain chain = { + .length = 0, + }; + ptr = vtn_nir_deref_pointer_dereference(b, ptr, &chain); } - vtn_assert(members == NULL); - return deref_var; + return ptr->deref; } static void -_vtn_local_load_store(struct vtn_builder *b, bool load, nir_deref_var *deref, - nir_deref *tail, struct vtn_ssa_value *inout) +_vtn_local_load_store(struct vtn_builder *b, bool load, nir_deref_instr *deref, + struct vtn_ssa_value *inout) { - /* The deref tail may contain a deref to select a component of a vector (in - * other words, it might not be an actual tail) so we have to save it away - * here since we overwrite it later. - */ - nir_deref *old_child = tail->child; - - if (glsl_type_is_vector_or_scalar(tail->type)) { - /* Terminate the deref chain in case there is one more link to pick - * off a component of the vector. - */ - tail->child = NULL; - - nir_intrinsic_op op = load ? nir_intrinsic_load_var : - nir_intrinsic_store_var; - - nir_intrinsic_instr *intrin = nir_intrinsic_instr_create(b->shader, op); - intrin->variables[0] = nir_deref_var_clone(deref, intrin); - intrin->num_components = glsl_get_vector_elements(tail->type); - + if (glsl_type_is_vector_or_scalar(deref->type)) { if (load) { - nir_ssa_dest_init(&intrin->instr, &intrin->dest, - intrin->num_components, - glsl_get_bit_size(tail->type), - NULL); - inout->def = &intrin->dest.ssa; + inout->def = nir_load_deref(&b->nb, deref); } else { - nir_intrinsic_set_write_mask(intrin, (1 << intrin->num_components) - 1); - intrin->src[0] = nir_src_for_ssa(inout->def); + nir_store_deref(&b->nb, deref, inout->def, ~0); } - - nir_builder_instr_insert(&b->nb, &intrin->instr); - } else if (glsl_get_base_type(tail->type) == GLSL_TYPE_ARRAY || - glsl_type_is_matrix(tail->type)) { - unsigned elems = glsl_get_length(tail->type); - nir_deref_array *deref_arr = nir_deref_array_create(b); - deref_arr->deref_array_type = nir_deref_array_type_direct; - deref_arr->deref.type = glsl_get_array_element(tail->type); - tail->child = &deref_arr->deref; + } else if (glsl_type_is_array(deref->type) || + glsl_type_is_matrix(deref->type)) { + unsigned elems = glsl_get_length(deref->type); for (unsigned i = 0; i < elems; i++) { - deref_arr->base_offset = i; - _vtn_local_load_store(b, load, deref, tail->child, inout->elems[i]); + nir_deref_instr *child = + nir_build_deref_array(&b->nb, deref, nir_imm_int(&b->nb, i)); + _vtn_local_load_store(b, load, child, inout->elems[i]); } } else { - vtn_assert(glsl_get_base_type(tail->type) == GLSL_TYPE_STRUCT); - unsigned elems = glsl_get_length(tail->type); - nir_deref_struct *deref_struct = nir_deref_struct_create(b, 0); - tail->child = &deref_struct->deref; + vtn_assert(glsl_type_is_struct(deref->type)); + unsigned elems = glsl_get_length(deref->type); for (unsigned i = 0; i < elems; i++) { - deref_struct->index = i; - deref_struct->deref.type = glsl_get_struct_field(tail->type, i); - _vtn_local_load_store(b, load, deref, tail->child, inout->elems[i]); + nir_deref_instr *child = nir_build_deref_struct(&b->nb, deref, i); + _vtn_local_load_store(b, load, child, inout->elems[i]); } } - - tail->child = old_child; } -nir_deref_var * +nir_deref_instr * vtn_nir_deref(struct vtn_builder *b, uint32_t id) { struct vtn_pointer *ptr = vtn_value(b, id, vtn_value_type_pointer)->pointer; @@ -540,32 +599,35 @@ vtn_nir_deref(struct vtn_builder *b, uint32_t id) * selecting which component due to OpAccessChain supporting per-component * indexing in SPIR-V. */ -static nir_deref * -get_deref_tail(nir_deref_var *deref) +static nir_deref_instr * +get_deref_tail(nir_deref_instr *deref) { - nir_deref *cur = &deref->deref; - while (!glsl_type_is_vector_or_scalar(cur->type) && cur->child) - cur = cur->child; + if (deref->deref_type != nir_deref_type_array) + return deref; + + nir_deref_instr *parent = + nir_instr_as_deref(deref->parent.ssa->parent_instr); - return cur; + if (glsl_type_is_vector(parent->type)) + return parent; + else + return deref; } struct vtn_ssa_value * -vtn_local_load(struct vtn_builder *b, nir_deref_var *src) +vtn_local_load(struct vtn_builder *b, nir_deref_instr *src) { - nir_deref *src_tail = get_deref_tail(src); + nir_deref_instr *src_tail = get_deref_tail(src); struct vtn_ssa_value *val = vtn_create_ssa_value(b, src_tail->type); - _vtn_local_load_store(b, true, src, src_tail, val); - - if (src_tail->child) { - nir_deref_array *vec_deref = nir_deref_as_array(src_tail->child); - vtn_assert(vec_deref->deref.child == NULL); - val->type = vec_deref->deref.type; - if (vec_deref->deref_array_type == nir_deref_array_type_direct) - val->def = vtn_vector_extract(b, val->def, vec_deref->base_offset); + _vtn_local_load_store(b, true, src_tail, val); + + if (src_tail != src) { + val->type = src->type; + if (nir_src_is_const(src->arr.index)) + val->def = vtn_vector_extract(b, val->def, + nir_src_as_uint(src->arr.index)); else - val->def = vtn_vector_extract_dynamic(b, val->def, - vec_deref->indirect.ssa); + val->def = vtn_vector_extract_dynamic(b, val->def, src->arr.index.ssa); } return val; @@ -573,91 +635,39 @@ vtn_local_load(struct vtn_builder *b, nir_deref_var *src) void vtn_local_store(struct vtn_builder *b, struct vtn_ssa_value *src, - nir_deref_var *dest) + nir_deref_instr *dest) { - nir_deref *dest_tail = get_deref_tail(dest); + nir_deref_instr *dest_tail = get_deref_tail(dest); - if (dest_tail->child) { + if (dest_tail != dest) { struct vtn_ssa_value *val = vtn_create_ssa_value(b, dest_tail->type); - _vtn_local_load_store(b, true, dest, dest_tail, val); - nir_deref_array *deref = nir_deref_as_array(dest_tail->child); - vtn_assert(deref->deref.child == NULL); - if (deref->deref_array_type == nir_deref_array_type_direct) + _vtn_local_load_store(b, true, dest_tail, val); + + if (nir_src_is_const(dest->arr.index)) val->def = vtn_vector_insert(b, val->def, src->def, - deref->base_offset); + nir_src_as_uint(dest->arr.index)); else val->def = vtn_vector_insert_dynamic(b, val->def, src->def, - deref->indirect.ssa); - _vtn_local_load_store(b, false, dest, dest_tail, val); + dest->arr.index.ssa); + _vtn_local_load_store(b, false, dest_tail, val); } else { - _vtn_local_load_store(b, false, dest, dest_tail, src); + _vtn_local_load_store(b, false, dest_tail, src); } } nir_ssa_def * vtn_pointer_to_offset(struct vtn_builder *b, struct vtn_pointer *ptr, - nir_ssa_def **index_out, unsigned *end_idx_out) + nir_ssa_def **index_out) { - if (vtn_pointer_uses_ssa_offset(b, ptr)) { - if (!ptr->offset) { - struct vtn_access_chain chain = { - .length = 0, - }; - ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain); - } - *index_out = ptr->block_index; - return ptr->offset; - } - - vtn_assert(ptr->mode == vtn_variable_mode_push_constant); - *index_out = NULL; - - unsigned idx = 0; - struct vtn_type *type = ptr->var->type; - nir_ssa_def *offset = nir_imm_int(&b->nb, 0); - - if (ptr->chain) { - for (; idx < ptr->chain->length; idx++) { - enum glsl_base_type base_type = glsl_get_base_type(type->type); - switch (base_type) { - case GLSL_TYPE_UINT: - case GLSL_TYPE_INT: - case GLSL_TYPE_UINT16: - case GLSL_TYPE_INT16: - case GLSL_TYPE_UINT64: - case GLSL_TYPE_INT64: - case GLSL_TYPE_FLOAT: - case GLSL_TYPE_FLOAT16: - case GLSL_TYPE_DOUBLE: - case GLSL_TYPE_BOOL: - case GLSL_TYPE_ARRAY: - offset = nir_iadd(&b->nb, offset, - vtn_access_link_as_ssa(b, ptr->chain->link[idx], - type->stride)); - - type = type->array_element; - break; - - case GLSL_TYPE_STRUCT: { - vtn_assert(ptr->chain->link[idx].mode == vtn_access_mode_literal); - unsigned member = ptr->chain->link[idx].id; - offset = nir_iadd(&b->nb, offset, - nir_imm_int(&b->nb, type->offsets[member])); - type = type->members[member]; - break; - } - - default: - vtn_fail("Invalid type for deref"); - } - } + assert(vtn_pointer_uses_ssa_offset(b, ptr)); + if (!ptr->offset) { + struct vtn_access_chain chain = { + .length = 0, + }; + ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain); } - - vtn_assert(type == ptr->type); - if (end_idx_out) - *end_idx_out = idx; - - return offset; + *index_out = ptr->block_index; + return ptr->offset; } /* Tries to compute the size of an interface block based on the strides and @@ -672,6 +682,8 @@ vtn_type_block_size(struct vtn_builder *b, struct vtn_type *type) case GLSL_TYPE_INT: case GLSL_TYPE_UINT16: case GLSL_TYPE_INT16: + case GLSL_TYPE_UINT8: + case GLSL_TYPE_INT8: case GLSL_TYPE_UINT64: case GLSL_TYPE_INT64: case GLSL_TYPE_FLOAT: @@ -712,40 +724,23 @@ vtn_type_block_size(struct vtn_builder *b, struct vtn_type *type) } } -static void -vtn_access_chain_get_offset_size(struct vtn_builder *b, - struct vtn_access_chain *chain, - struct vtn_type *type, - unsigned *access_offset, - unsigned *access_size) -{ - *access_offset = 0; - - for (unsigned i = 0; i < chain->length; i++) { - if (chain->link[i].mode != vtn_access_mode_literal) - break; - - if (glsl_type_is_struct(type->type)) { - *access_offset += type->offsets[chain->link[i].id]; - type = type->members[chain->link[i].id]; - } else { - *access_offset += type->stride * chain->link[i].id; - type = type->array_element; - } - } - - *access_size = vtn_type_block_size(b, type); -} - static void _vtn_load_store_tail(struct vtn_builder *b, nir_intrinsic_op op, bool load, nir_ssa_def *index, nir_ssa_def *offset, unsigned access_offset, unsigned access_size, - struct vtn_ssa_value **inout, const struct glsl_type *type) + struct vtn_ssa_value **inout, const struct glsl_type *type, + enum gl_access_qualifier access) { nir_intrinsic_instr *instr = nir_intrinsic_instr_create(b->nb.shader, op); instr->num_components = glsl_get_vector_elements(type); + /* Booleans usually shouldn't show up in external memory in SPIR-V. + * However, they do for certain older GLSLang versions and can for shared + * memory when we lower access chains internally. + */ + const unsigned data_bit_size = glsl_type_is_boolean(type) ? 32 : + glsl_get_bit_size(type); + int src = 0; if (!load) { nir_intrinsic_set_write_mask(instr, (1 << instr->num_components) - 1); @@ -757,6 +752,17 @@ _vtn_load_store_tail(struct vtn_builder *b, nir_intrinsic_op op, bool load, nir_intrinsic_set_range(instr, access_size); } + if (op == nir_intrinsic_load_ssbo || + op == nir_intrinsic_store_ssbo) { + nir_intrinsic_set_access(instr, access); + } + + /* With extensions like relaxed_block_layout, we really can't guarantee + * much more than scalar alignment. + */ + if (op != nir_intrinsic_load_push_constant) + nir_intrinsic_set_align(instr, data_bit_size / 8, 0); + if (index) instr->src[src++] = nir_src_for_ssa(index); @@ -772,8 +778,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(type), NULL); + instr->num_components, data_bit_size, NULL); (*inout)->def = &instr->dest.ssa; } @@ -787,13 +792,10 @@ static void _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, nir_ssa_def *index, nir_ssa_def *offset, unsigned access_offset, unsigned access_size, - struct vtn_access_chain *chain, unsigned chain_idx, - struct vtn_type *type, struct vtn_ssa_value **inout) + struct vtn_type *type, enum gl_access_qualifier access, + struct vtn_ssa_value **inout) { - if (chain && chain_idx >= chain->length) - chain = NULL; - - if (load && chain == NULL && *inout == NULL) + if (load && *inout == NULL) *inout = vtn_create_ssa_value(b, type->type); enum glsl_base_type base_type = glsl_get_base_type(type->type); @@ -802,6 +804,8 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, case GLSL_TYPE_INT: case GLSL_TYPE_UINT16: case GLSL_TYPE_INT16: + case GLSL_TYPE_UINT8: + case GLSL_TYPE_INT8: case GLSL_TYPE_UINT64: case GLSL_TYPE_INT64: case GLSL_TYPE_FLOAT: @@ -835,11 +839,12 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, for (unsigned i = 0; i < num_ops; i++) { nir_ssa_def *elem_offset = - nir_iadd(&b->nb, offset, nir_imm_int(&b->nb, i * col_stride)); + nir_iadd_imm(&b->nb, offset, i * col_stride); _vtn_load_store_tail(b, op, load, index, elem_offset, access_offset, access_size, &(*inout)->elems[i], - glsl_vector_type(base_type, vec_width)); + glsl_vector_type(base_type, vec_width), + type->access | access); } if (load && type->row_major) @@ -852,7 +857,8 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, vtn_assert(glsl_type_is_vector_or_scalar(type->type)); _vtn_load_store_tail(b, op, load, index, offset, access_offset, access_size, - inout, type->type); + inout, type->type, + type->access | access); } else { /* This is a strided load. We have to load N things separately. * This is the single column of a row-major matrix case. @@ -863,8 +869,7 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, nir_ssa_def *per_comp[4]; for (unsigned i = 0; i < elems; i++) { nir_ssa_def *elem_offset = - nir_iadd(&b->nb, offset, - nir_imm_int(&b->nb, i * type->stride)); + nir_iadd_imm(&b->nb, offset, i * type->stride); struct vtn_ssa_value *comp, temp_val; if (!load) { temp_val.def = nir_channel(&b->nb, (*inout)->def, i); @@ -873,7 +878,8 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, comp = &temp_val; _vtn_load_store_tail(b, op, load, index, elem_offset, access_offset, access_size, - &comp, glsl_scalar_type(base_type)); + &comp, glsl_scalar_type(base_type), + type->access | access); per_comp[i] = comp->def; } @@ -890,11 +896,12 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, unsigned elems = glsl_get_length(type->type); for (unsigned i = 0; i < elems; i++) { nir_ssa_def *elem_off = - nir_iadd(&b->nb, offset, nir_imm_int(&b->nb, i * type->stride)); + nir_iadd_imm(&b->nb, offset, i * type->stride); _vtn_block_load_store(b, op, load, index, elem_off, access_offset, access_size, - NULL, 0, - type->array_element, &(*inout)->elems[i]); + type->array_element, + type->array_element->access | access, + &(*inout)->elems[i]); } return; } @@ -903,11 +910,12 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load, unsigned elems = glsl_get_length(type->type); for (unsigned i = 0; i < elems; i++) { nir_ssa_def *elem_off = - nir_iadd(&b->nb, offset, nir_imm_int(&b->nb, type->offsets[i])); + nir_iadd_imm(&b->nb, offset, type->offsets[i]); _vtn_block_load_store(b, op, load, index, elem_off, access_offset, access_size, - NULL, 0, - type->members[i], &(*inout)->elems[i]); + type->members[i], + type->members[i]->access | access, + &(*inout)->elems[i]); } return; } @@ -931,8 +939,7 @@ vtn_block_load(struct vtn_builder *b, struct vtn_pointer *src) break; case vtn_variable_mode_push_constant: op = nir_intrinsic_load_push_constant; - vtn_access_chain_get_offset_size(b, src->chain, src->var->type, - &access_offset, &access_size); + access_size = b->shader->num_uniforms; break; case vtn_variable_mode_workgroup: op = nir_intrinsic_load_shared; @@ -942,13 +949,12 @@ vtn_block_load(struct vtn_builder *b, struct vtn_pointer *src) } nir_ssa_def *offset, *index = NULL; - unsigned chain_idx; - offset = vtn_pointer_to_offset(b, src, &index, &chain_idx); + offset = vtn_pointer_to_offset(b, src, &index); struct vtn_ssa_value *value = NULL; _vtn_block_load_store(b, op, true, index, offset, access_offset, access_size, - src->chain, chain_idx, src->type, &value); + src->type, src->access, &value); return value; } @@ -969,11 +975,10 @@ vtn_block_store(struct vtn_builder *b, struct vtn_ssa_value *src, } nir_ssa_def *offset, *index = NULL; - unsigned chain_idx; - offset = vtn_pointer_to_offset(b, dst, &index, &chain_idx); + offset = vtn_pointer_to_offset(b, dst, &index); _vtn_block_load_store(b, op, false, index, offset, - 0, 0, dst->chain, chain_idx, dst->type, &src); + 0, 0, dst->type, dst->access, &src); } static void @@ -987,24 +992,43 @@ _vtn_variable_load_store(struct vtn_builder *b, bool load, case GLSL_TYPE_INT: case GLSL_TYPE_UINT16: case GLSL_TYPE_INT16: + case GLSL_TYPE_UINT8: + case GLSL_TYPE_INT8: case GLSL_TYPE_UINT64: case GLSL_TYPE_INT64: case GLSL_TYPE_FLOAT: case GLSL_TYPE_FLOAT16: case GLSL_TYPE_BOOL: case GLSL_TYPE_DOUBLE: - /* At this point, we have a scalar, vector, or matrix so we know that - * there cannot be any structure splitting still in the way. By - * stopping at the matrix level rather than the vector level, we - * ensure that matrices get loaded in the optimal way even if they - * are storred row-major in a UBO. - */ - if (load) { - *inout = vtn_local_load(b, vtn_pointer_to_deref(b, ptr)); - } else { - vtn_local_store(b, *inout, vtn_pointer_to_deref(b, ptr)); + if (glsl_type_is_vector_or_scalar(ptr->type->type)) { + /* We hit a vector or scalar; go ahead and emit the load[s] */ + nir_deref_instr *deref = vtn_pointer_to_deref(b, ptr); + if (vtn_pointer_is_external_block(b, ptr)) { + /* If it's external, we call nir_load/store_deref directly. The + * vtn_local_load/store helpers are too clever and do magic to + * avoid array derefs of vectors. That magic is both less + * efficient than the direct load/store and, in the case of + * stores, is broken because it creates a race condition if two + * threads are writing to different components of the same vector + * due to the load+insert+store it uses to emulate the array + * deref. + */ + if (load) { + *inout = vtn_create_ssa_value(b, ptr->type->type); + (*inout)->def = nir_load_deref(&b->nb, deref); + } else { + nir_store_deref(&b->nb, deref, (*inout)->def, ~0); + } + } else { + if (load) { + *inout = vtn_local_load(b, deref); + } else { + vtn_local_store(b, *inout, deref); + } + } + return; } - return; + /* Fall through */ case GLSL_TYPE_ARRAY: case GLSL_TYPE_STRUCT: { @@ -1038,7 +1062,7 @@ _vtn_variable_load_store(struct vtn_builder *b, bool load, struct vtn_ssa_value * vtn_variable_load(struct vtn_builder *b, struct vtn_pointer *src) { - if (vtn_pointer_is_external_block(b, src)) { + if (vtn_pointer_uses_ssa_offset(b, src)) { return vtn_block_load(b, src); } else { struct vtn_ssa_value *val = NULL; @@ -1051,7 +1075,7 @@ void vtn_variable_store(struct vtn_builder *b, struct vtn_ssa_value *src, struct vtn_pointer *dest) { - if (vtn_pointer_is_external_block(b, dest)) { + if (vtn_pointer_uses_ssa_offset(b, dest)) { vtn_assert(dest->mode == vtn_variable_mode_ssbo || dest->mode == vtn_variable_mode_workgroup); vtn_block_store(b, src, dest); @@ -1071,6 +1095,8 @@ _vtn_variable_copy(struct vtn_builder *b, struct vtn_pointer *dest, case GLSL_TYPE_INT: case GLSL_TYPE_UINT16: case GLSL_TYPE_INT16: + case GLSL_TYPE_UINT8: + case GLSL_TYPE_INT8: case GLSL_TYPE_UINT64: case GLSL_TYPE_INT64: case GLSL_TYPE_FLOAT: @@ -1147,15 +1173,15 @@ vtn_get_builtin_location(struct vtn_builder *b, case SpvBuiltInCullDistance: *location = VARYING_SLOT_CULL_DIST0; break; - case SpvBuiltInVertexIndex: - *location = SYSTEM_VALUE_VERTEX_ID; - set_mode_system_value(b, mode); - break; case SpvBuiltInVertexId: - /* Vulkan defines VertexID to be zero-based and reserves the new - * builtin keyword VertexIndex to indicate the non-zero-based value. + case SpvBuiltInVertexIndex: + /* The Vulkan spec defines VertexIndex to be non-zero-based and doesn't + * allow VertexId. The ARB_gl_spirv spec defines VertexId to be the + * same as gl_VertexID, which is non-zero-based, and removes + * VertexIndex. Since they're both defined to be non-zero-based, we use + * SYSTEM_VALUE_VERTEX_ID for both. */ - *location = SYSTEM_VALUE_VERTEX_ID_ZERO_BASE; + *location = SYSTEM_VALUE_VERTEX_ID; set_mode_system_value(b, mode); break; case SpvBuiltInInstanceIndex: @@ -1262,8 +1288,8 @@ vtn_get_builtin_location(struct vtn_builder *b, set_mode_system_value(b, mode); break; case SpvBuiltInWorkgroupSize: - /* This should already be handled */ - vtn_fail("unsupported builtin"); + *location = SYSTEM_VALUE_LOCAL_GROUP_SIZE; + set_mode_system_value(b, mode); break; case SpvBuiltInWorkgroupId: *location = SYSTEM_VALUE_WORK_GROUP_ID; @@ -1282,7 +1308,10 @@ vtn_get_builtin_location(struct vtn_builder *b, set_mode_system_value(b, mode); break; case SpvBuiltInBaseVertex: - *location = SYSTEM_VALUE_BASE_VERTEX; + /* OpenGL gl_BaseVertex (SYSTEM_VALUE_BASE_VERTEX) is not the same + * semantic as SPIR-V BaseVertex (SYSTEM_VALUE_FIRST_VERTEX). + */ + *location = SYSTEM_VALUE_FIRST_VERTEX; set_mode_system_value(b, mode); break; case SpvBuiltInBaseInstance: @@ -1293,93 +1322,132 @@ vtn_get_builtin_location(struct vtn_builder *b, *location = SYSTEM_VALUE_DRAW_ID; set_mode_system_value(b, mode); break; + case SpvBuiltInSubgroupSize: + *location = SYSTEM_VALUE_SUBGROUP_SIZE; + set_mode_system_value(b, mode); + break; + case SpvBuiltInSubgroupId: + *location = SYSTEM_VALUE_SUBGROUP_ID; + set_mode_system_value(b, mode); + break; + case SpvBuiltInSubgroupLocalInvocationId: + *location = SYSTEM_VALUE_SUBGROUP_INVOCATION; + set_mode_system_value(b, mode); + break; + case SpvBuiltInNumSubgroups: + *location = SYSTEM_VALUE_NUM_SUBGROUPS; + set_mode_system_value(b, mode); + break; + case SpvBuiltInDeviceIndex: + *location = SYSTEM_VALUE_DEVICE_INDEX; + set_mode_system_value(b, mode); + break; case SpvBuiltInViewIndex: *location = SYSTEM_VALUE_VIEW_INDEX; set_mode_system_value(b, mode); break; + case SpvBuiltInSubgroupEqMask: + *location = SYSTEM_VALUE_SUBGROUP_EQ_MASK, + set_mode_system_value(b, mode); + break; + case SpvBuiltInSubgroupGeMask: + *location = SYSTEM_VALUE_SUBGROUP_GE_MASK, + set_mode_system_value(b, mode); + break; + case SpvBuiltInSubgroupGtMask: + *location = SYSTEM_VALUE_SUBGROUP_GT_MASK, + set_mode_system_value(b, mode); + break; + case SpvBuiltInSubgroupLeMask: + *location = SYSTEM_VALUE_SUBGROUP_LE_MASK, + set_mode_system_value(b, mode); + break; + case SpvBuiltInSubgroupLtMask: + *location = SYSTEM_VALUE_SUBGROUP_LT_MASK, + set_mode_system_value(b, mode); + break; + case SpvBuiltInFragStencilRefEXT: + *location = FRAG_RESULT_STENCIL; + vtn_assert(*mode == nir_var_shader_out); + break; + case SpvBuiltInWorkDim: + *location = SYSTEM_VALUE_WORK_DIM; + set_mode_system_value(b, mode); + break; + case SpvBuiltInGlobalSize: + *location = SYSTEM_VALUE_GLOBAL_GROUP_SIZE; + set_mode_system_value(b, mode); + break; default: - vtn_fail("unsupported builtin"); + vtn_fail("unsupported builtin: %u", builtin); } } static void -apply_var_decoration(struct vtn_builder *b, nir_variable *nir_var, +apply_var_decoration(struct vtn_builder *b, + struct nir_variable_data *var_data, const struct vtn_decoration *dec) { switch (dec->decoration) { case SpvDecorationRelaxedPrecision: break; /* FIXME: Do nothing with this for now. */ case SpvDecorationNoPerspective: - nir_var->data.interpolation = INTERP_MODE_NOPERSPECTIVE; + var_data->interpolation = INTERP_MODE_NOPERSPECTIVE; break; case SpvDecorationFlat: - nir_var->data.interpolation = INTERP_MODE_FLAT; + var_data->interpolation = INTERP_MODE_FLAT; break; case SpvDecorationCentroid: - nir_var->data.centroid = true; + var_data->centroid = true; break; case SpvDecorationSample: - nir_var->data.sample = true; + var_data->sample = true; break; case SpvDecorationInvariant: - nir_var->data.invariant = true; + var_data->invariant = true; break; case SpvDecorationConstant: - vtn_assert(nir_var->constant_initializer != NULL); - nir_var->data.read_only = true; + var_data->read_only = true; break; case SpvDecorationNonReadable: - nir_var->data.image.write_only = true; + var_data->image.access |= ACCESS_NON_READABLE; break; case SpvDecorationNonWritable: - nir_var->data.read_only = true; - nir_var->data.image.read_only = true; + var_data->read_only = true; + var_data->image.access |= ACCESS_NON_WRITEABLE; break; case SpvDecorationRestrict: - nir_var->data.image.restrict_flag = true; + var_data->image.access |= ACCESS_RESTRICT; break; case SpvDecorationVolatile: - nir_var->data.image._volatile = true; + var_data->image.access |= ACCESS_VOLATILE; break; case SpvDecorationCoherent: - nir_var->data.image.coherent = true; + var_data->image.access |= ACCESS_COHERENT; break; case SpvDecorationComponent: - nir_var->data.location_frac = dec->literals[0]; + var_data->location_frac = dec->literals[0]; break; case SpvDecorationIndex: - nir_var->data.index = dec->literals[0]; + var_data->index = dec->literals[0]; break; case SpvDecorationBuiltIn: { SpvBuiltIn builtin = dec->literals[0]; - if (builtin == SpvBuiltInWorkgroupSize) { - /* This shouldn't be a builtin. It's actually a constant. */ - nir_var->data.mode = nir_var_global; - nir_var->data.read_only = true; - - nir_constant *c = rzalloc(nir_var, nir_constant); - c->values[0].u32[0] = b->shader->info.cs.local_size[0]; - c->values[0].u32[1] = b->shader->info.cs.local_size[1]; - c->values[0].u32[2] = b->shader->info.cs.local_size[2]; - nir_var->constant_initializer = c; - break; - } - - nir_variable_mode mode = nir_var->data.mode; - vtn_get_builtin_location(b, builtin, &nir_var->data.location, &mode); - nir_var->data.mode = mode; + nir_variable_mode mode = var_data->mode; + vtn_get_builtin_location(b, builtin, &var_data->location, &mode); + var_data->mode = mode; switch (builtin) { case SpvBuiltInTessLevelOuter: case SpvBuiltInTessLevelInner: - nir_var->data.compact = true; + var_data->compact = true; break; - case SpvBuiltInSamplePosition: - nir_var->data.origin_upper_left = b->origin_upper_left; - /* fallthrough */ case SpvBuiltInFragCoord: - nir_var->data.pixel_center_integer = b->pixel_center_integer; + var_data->pixel_center_integer = b->pixel_center_integer; + /* fallthrough */ + case SpvBuiltInSamplePosition: + var_data->origin_upper_left = b->origin_upper_left; break; default: break; @@ -1392,13 +1460,11 @@ apply_var_decoration(struct vtn_builder *b, nir_variable *nir_var, case SpvDecorationMatrixStride: case SpvDecorationAliased: case SpvDecorationUniform: - case SpvDecorationStream: - case SpvDecorationOffset: case SpvDecorationLinkageAttributes: break; /* Do nothing with these here */ case SpvDecorationPatch: - nir_var->data.patch = true; + var_data->patch = true; break; case SpvDecorationLocation: @@ -1420,9 +1486,21 @@ apply_var_decoration(struct vtn_builder *b, nir_variable *nir_var, break; case SpvDecorationXfbBuffer: + var_data->explicit_xfb_buffer = true; + var_data->xfb_buffer = dec->literals[0]; + var_data->always_active_io = true; + break; case SpvDecorationXfbStride: - vtn_warn("Vulkan does not have transform feedback: %s", - spirv_decoration_to_string(dec->decoration)); + var_data->explicit_xfb_stride = true; + var_data->xfb_stride = dec->literals[0]; + break; + case SpvDecorationOffset: + var_data->explicit_offset = true; + var_data->offset = dec->literals[0]; + break; + + case SpvDecorationStream: + var_data->stream = dec->literals[0]; break; case SpvDecorationCPacked: @@ -1435,6 +1513,10 @@ apply_var_decoration(struct vtn_builder *b, nir_variable *nir_var, spirv_decoration_to_string(dec->decoration)); break; + case SpvDecorationHlslSemanticGOOGLE: + /* HLSL semantic decorations can safely be ignored by the driver. */ + break; + default: vtn_fail("Unhandled decoration"); } @@ -1459,6 +1541,7 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, switch (dec->decoration) { case SpvDecorationBinding: vtn_var->binding = dec->literals[0]; + vtn_var->explicit_binding = true; return; case SpvDecorationDescriptorSet: vtn_var->descriptor_set = dec->literals[0]; @@ -1469,13 +1552,30 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, case SpvDecorationPatch: vtn_var->patch = true; break; + case SpvDecorationOffset: + vtn_var->offset = dec->literals[0]; + break; + case SpvDecorationNonWritable: + vtn_var->access |= ACCESS_NON_WRITEABLE; + break; + case SpvDecorationNonReadable: + vtn_var->access |= ACCESS_NON_READABLE; + break; + case SpvDecorationVolatile: + vtn_var->access |= ACCESS_VOLATILE; + break; + case SpvDecorationCoherent: + vtn_var->access |= ACCESS_COHERENT; + break; + case SpvDecorationHlslCounterBufferGOOGLE: + /* HLSL semantic decorations can safely be ignored by the driver. */ + break; default: break; } if (val->value_type == vtn_value_type_pointer) { assert(val->pointer->var == void_var); - assert(val->pointer->chain == NULL); assert(member == -1); } else { assert(val->value_type == vtn_value_type_type); @@ -1487,10 +1587,9 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, */ if (dec->decoration == SpvDecorationLocation) { unsigned location = dec->literals[0]; - bool is_vertex_input; + bool is_vertex_input = false; if (b->shader->info.stage == MESA_SHADER_FRAGMENT && vtn_var->mode == vtn_variable_mode_output) { - is_vertex_input = false; location += FRAG_RESULT_DATA0; } else if (b->shader->info.stage == MESA_SHADER_VERTEX && vtn_var->mode == vtn_variable_mode_input) { @@ -1498,43 +1597,42 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, location += VERT_ATTRIB_GENERIC0; } else if (vtn_var->mode == vtn_variable_mode_input || vtn_var->mode == vtn_variable_mode_output) { - is_vertex_input = false; location += vtn_var->patch ? VARYING_SLOT_PATCH0 : VARYING_SLOT_VAR0; - } else { - vtn_warn("Location must be on input or output variable"); + } else if (vtn_var->mode != vtn_variable_mode_uniform) { + vtn_warn("Location must be on input, output, uniform, sampler or " + "image variable"); return; } - if (vtn_var->var) { + if (vtn_var->var->num_members == 0) { /* This handles the member and lone variable cases */ vtn_var->var->data.location = location; } else { /* This handles the structure member case */ - assert(vtn_var->members); - unsigned length = - glsl_get_length(glsl_without_array(vtn_var->type->type)); - for (unsigned i = 0; i < length; i++) { - vtn_var->members[i]->data.location = location; - location += - glsl_count_attribute_slots(vtn_var->members[i]->interface_type, - is_vertex_input); + assert(vtn_var->var->members); + for (unsigned i = 0; i < vtn_var->var->num_members; i++) { + vtn_var->var->members[i].location = location; + const struct glsl_type *member_type = + glsl_get_struct_field(vtn_var->var->interface_type, i); + location += glsl_count_attribute_slots(member_type, + is_vertex_input); } } return; } else { if (vtn_var->var) { - assert(member == -1); - apply_var_decoration(b, vtn_var->var, dec); - } else if (vtn_var->members) { - if (member >= 0) { + if (vtn_var->var->num_members == 0) { + assert(member == -1); + apply_var_decoration(b, &vtn_var->var->data, dec); + } else if (member >= 0) { /* Member decorations must come from a type */ assert(val->value_type == vtn_value_type_type); - apply_var_decoration(b, vtn_var->members[member], dec); + apply_var_decoration(b, &vtn_var->var->members[member], dec); } else { unsigned length = glsl_get_length(glsl_without_array(vtn_var->type->type)); for (unsigned i = 0; i < length; i++) - apply_var_decoration(b, vtn_var->members[i], dec); + apply_var_decoration(b, &vtn_var->var->members[i], dec); } } else { /* A few variables, those with external storage, have no actual @@ -1562,28 +1660,23 @@ vtn_storage_class_to_mode(struct vtn_builder *b, case SpvStorageClassUniform: if (interface_type->block) { mode = vtn_variable_mode_ubo; - nir_mode = 0; + nir_mode = nir_var_ubo; } else if (interface_type->buffer_block) { mode = vtn_variable_mode_ssbo; - nir_mode = 0; + nir_mode = nir_var_ssbo; } else { - vtn_fail("Invalid uniform variable type"); + /* Default-block uniforms, coming from gl_spirv */ + mode = vtn_variable_mode_uniform; + nir_mode = nir_var_uniform; } break; case SpvStorageClassStorageBuffer: mode = vtn_variable_mode_ssbo; - nir_mode = 0; + nir_mode = nir_var_ssbo; break; case SpvStorageClassUniformConstant: - if (glsl_type_is_image(interface_type->type)) { - mode = vtn_variable_mode_image; - nir_mode = nir_var_uniform; - } else if (glsl_type_is_sampler(interface_type->type)) { - mode = vtn_variable_mode_sampler; - nir_mode = nir_var_uniform; - } else { - vtn_fail("Invalid uniform constant variable type"); - } + mode = vtn_variable_mode_uniform; + nir_mode = nir_var_uniform; break; case SpvStorageClassPushConstant: mode = vtn_variable_mode_push_constant; @@ -1609,9 +1702,12 @@ vtn_storage_class_to_mode(struct vtn_builder *b, mode = vtn_variable_mode_workgroup; nir_mode = nir_var_shared; break; + case SpvStorageClassAtomicCounter: + mode = vtn_variable_mode_uniform; + nir_mode = nir_var_uniform; + break; case SpvStorageClassCrossWorkgroup: case SpvStorageClassGeneric: - case SpvStorageClassAtomicCounter: default: vtn_fail("Unhandled variable storage class"); } @@ -1625,30 +1721,64 @@ vtn_storage_class_to_mode(struct vtn_builder *b, nir_ssa_def * vtn_pointer_to_ssa(struct vtn_builder *b, struct vtn_pointer *ptr) { - /* This pointer needs to have a pointer type with actual storage */ - vtn_assert(ptr->ptr_type); - vtn_assert(ptr->ptr_type->type); + if (vtn_pointer_uses_ssa_offset(b, ptr)) { + /* This pointer needs to have a pointer type with actual storage */ + vtn_assert(ptr->ptr_type); + vtn_assert(ptr->ptr_type->type); - if (!ptr->offset) { - /* If we don't have an offset then we must be a pointer to the variable - * itself. - */ - vtn_assert(!ptr->offset && !ptr->block_index); + if (!ptr->offset) { + /* If we don't have an offset then we must be a pointer to the variable + * itself. + */ + vtn_assert(!ptr->offset && !ptr->block_index); - struct vtn_access_chain chain = { - .length = 0, - }; - ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain); - } + struct vtn_access_chain chain = { + .length = 0, + }; + ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain); + } - vtn_assert(ptr->offset); - if (ptr->block_index) { - vtn_assert(ptr->mode == vtn_variable_mode_ubo || - ptr->mode == vtn_variable_mode_ssbo); - return nir_vec2(&b->nb, ptr->block_index, ptr->offset); + vtn_assert(ptr->offset); + if (ptr->block_index) { + vtn_assert(ptr->mode == vtn_variable_mode_ubo || + ptr->mode == vtn_variable_mode_ssbo); + return nir_vec2(&b->nb, ptr->block_index, ptr->offset); + } else { + vtn_assert(ptr->mode == vtn_variable_mode_workgroup); + return ptr->offset; + } } else { - vtn_assert(ptr->mode == vtn_variable_mode_workgroup); - return ptr->offset; + if (vtn_pointer_is_external_block(b, ptr) && + vtn_type_contains_block(b, ptr->type)) { + const unsigned bit_size = glsl_get_bit_size(ptr->ptr_type->type); + const unsigned num_components = + glsl_get_vector_elements(ptr->ptr_type->type); + + /* In this case, we're looking for a block index and not an actual + * deref. + */ + if (!ptr->block_index) { + /* If we don't have a block_index then we must be a pointer to the + * variable itself. + */ + vtn_assert(!ptr->deref); + + struct vtn_access_chain chain = { + .length = 0, + }; + ptr = vtn_nir_deref_pointer_dereference(b, ptr, &chain); + } + + /* A block index is just a 32-bit value but the pointer has some + * other dimensionality. Cram it in there and we'll unpack it later + * in vtn_pointer_from_ssa. + */ + const unsigned swiz[4] = { 0, }; + return nir_swizzle(&b->nb, nir_u2u(&b->nb, ptr->block_index, bit_size), + swiz, num_components, false); + } else { + return &vtn_pointer_to_deref(b, ptr)->dest.ssa; + } } } @@ -1658,27 +1788,55 @@ vtn_pointer_from_ssa(struct vtn_builder *b, nir_ssa_def *ssa, { vtn_assert(ssa->num_components <= 2 && ssa->bit_size == 32); vtn_assert(ptr_type->base_type == vtn_base_type_pointer); - vtn_assert(ptr_type->deref->base_type != vtn_base_type_pointer); - /* This pointer type needs to have actual storage */ - vtn_assert(ptr_type->type); + + struct vtn_type *interface_type = ptr_type->deref; + while (interface_type->base_type == vtn_base_type_array) + interface_type = interface_type->array_element; struct vtn_pointer *ptr = rzalloc(b, struct vtn_pointer); + nir_variable_mode nir_mode; ptr->mode = vtn_storage_class_to_mode(b, ptr_type->storage_class, - ptr_type, NULL); + interface_type, &nir_mode); ptr->type = ptr_type->deref; ptr->ptr_type = ptr_type; - if (ssa->num_components > 1) { - vtn_assert(ssa->num_components == 2); - vtn_assert(ptr->mode == vtn_variable_mode_ubo || - ptr->mode == vtn_variable_mode_ssbo); - ptr->block_index = nir_channel(&b->nb, ssa, 0); - ptr->offset = nir_channel(&b->nb, ssa, 1); + if (vtn_pointer_uses_ssa_offset(b, ptr)) { + /* This pointer type needs to have actual storage */ + vtn_assert(ptr_type->type); + if (ptr->mode == vtn_variable_mode_ubo || + ptr->mode == vtn_variable_mode_ssbo) { + vtn_assert(ssa->num_components == 2); + ptr->block_index = nir_channel(&b->nb, ssa, 0); + ptr->offset = nir_channel(&b->nb, ssa, 1); + } else { + vtn_assert(ssa->num_components == 1); + ptr->block_index = NULL; + ptr->offset = ssa; + } } else { - vtn_assert(ssa->num_components == 1); - vtn_assert(ptr->mode == vtn_variable_mode_workgroup); - ptr->block_index = NULL; - ptr->offset = ssa; + const struct glsl_type *deref_type = ptr_type->deref->type; + if (!vtn_pointer_is_external_block(b, ptr)) { + assert(ssa->bit_size == 32 && ssa->num_components == 1); + ptr->deref = nir_build_deref_cast(&b->nb, ssa, nir_mode, + glsl_get_bare_type(deref_type), 0); + } else if (vtn_type_contains_block(b, ptr->type)) { + /* This is a pointer to somewhere in an array of blocks, not a + * pointer to somewhere inside the block. We squashed it into a + * random vector type before so just pick off the first channel and + * cast it back to 32 bits. + */ + ptr->block_index = nir_u2u32(&b->nb, nir_channel(&b->nb, ssa, 0)); + } else { + /* This is a pointer to something internal or a pointer inside a + * block. It's just a regular cast. + */ + ptr->deref = nir_build_deref_cast(&b->nb, ssa, nir_mode, + ptr_type->deref->type, + ptr_type->stride); + ptr->deref->dest.ssa.num_components = + glsl_get_vector_elements(ptr_type->type); + ptr->deref->dest.ssa.bit_size = glsl_get_bit_size(ptr_type->type); + } } return ptr; @@ -1720,16 +1878,33 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, switch (mode) { case vtn_variable_mode_ubo: + /* There's no other way to get vtn_variable_mode_ubo */ + vtn_assert(without_array->block); b->shader->info.num_ubos++; break; case vtn_variable_mode_ssbo: + if (storage_class == SpvStorageClassStorageBuffer && + !without_array->block) { + if (b->variable_pointers) { + vtn_fail("Variables in the StorageBuffer storage class must " + "have a struct type with the Block decoration"); + } else { + /* If variable pointers are not present, it's still malformed + * SPIR-V but we can parse it and do the right thing anyway. + * Since some of the 8-bit storage tests have bugs in this are, + * just make it a warning for now. + */ + vtn_warn("Variables in the StorageBuffer storage class must " + "have a struct type with the Block decoration"); + } + } b->shader->info.num_ssbos++; break; - case vtn_variable_mode_image: - b->shader->info.num_images++; - break; - case vtn_variable_mode_sampler: - b->shader->info.num_textures++; + case vtn_variable_mode_uniform: + if (glsl_type_is_image(without_array->type)) + b->shader->info.num_images++; + else if (glsl_type_is_sampler(without_array->type)) + b->shader->info.num_textures++; break; case vtn_variable_mode_push_constant: b->shader->num_uniforms = vtn_type_block_size(b, type); @@ -1749,23 +1924,26 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, switch (var->mode) { case vtn_variable_mode_local: case vtn_variable_mode_global: - case vtn_variable_mode_image: - case vtn_variable_mode_sampler: + case vtn_variable_mode_uniform: /* For these, we create the variable normally */ var->var = rzalloc(b->shader, nir_variable); var->var->name = ralloc_strdup(var->var, val->name); - var->var->type = var->type->type; - var->var->data.mode = nir_mode; - switch (var->mode) { - case vtn_variable_mode_image: - case vtn_variable_mode_sampler: - var->var->interface_type = without_array->type; - break; - default: - var->var->interface_type = NULL; - break; + if (storage_class == SpvStorageClassAtomicCounter) { + /* Need to tweak the nir type here as at vtn_handle_type we don't + * have the access to storage_class, that is the one that points us + * that is an atomic uint. + */ + var->var->type = repair_atomic_type(var->type->type); + } else { + /* Private variables don't have any explicit layout but some layouts + * may have leaked through due to type deduplication in the SPIR-V. + */ + var->var->type = glsl_get_bare_type(var->type->type); } + var->var->data.mode = nir_mode; + var->var->data.location = -1; + var->var->interface_type = NULL; break; case vtn_variable_mode_workgroup: @@ -1775,7 +1953,11 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, /* Create the variable normally */ var->var = rzalloc(b->shader, nir_variable); var->var->name = ralloc_strdup(var->var, val->name); - var->var->type = var->type->type; + /* Workgroup variables don't have any explicit layout but some + * layouts may have leaked through due to type deduplication in the + * SPIR-V. + */ + var->var->type = glsl_get_bare_type(var->type->type); var->var->data.mode = nir_var_shared; } break; @@ -1815,7 +1997,6 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, * able to preserve that information. */ - int array_length = -1; struct vtn_type *interface_type = var->type; if (is_per_vertex_inout(var, b->shader->info.stage)) { /* In Geometry shaders (and some tessellation), inputs come @@ -1825,43 +2006,29 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, * check should be sufficient. */ interface_type = var->type->array_element; - array_length = glsl_get_length(var->type->type); } + var->var = rzalloc(b->shader, nir_variable); + var->var->name = ralloc_strdup(var->var, val->name); + /* In Vulkan, shader I/O variables don't have any explicit layout but + * some layouts may have leaked through due to type deduplication in + * the SPIR-V. + */ + var->var->type = glsl_get_bare_type(var->type->type); + var->var->interface_type = interface_type->type; + var->var->data.mode = nir_mode; + var->var->data.patch = var->patch; + if (glsl_type_is_struct(interface_type->type)) { - /* It's a struct. Split it. */ - unsigned num_members = glsl_get_length(interface_type->type); - var->members = ralloc_array(b, nir_variable *, num_members); - - for (unsigned i = 0; i < num_members; i++) { - const struct glsl_type *mtype = interface_type->members[i]->type; - if (array_length >= 0) - mtype = glsl_array_type(mtype, array_length); - - var->members[i] = rzalloc(b->shader, nir_variable); - var->members[i]->name = - ralloc_asprintf(var->members[i], "%s.%d", val->name, i); - var->members[i]->type = mtype; - var->members[i]->interface_type = - interface_type->members[i]->type; - var->members[i]->data.mode = nir_mode; - var->members[i]->data.patch = var->patch; - - if (initializer) { - assert(i < initializer->num_elements); - var->members[i]->constant_initializer = - nir_constant_clone(initializer->elements[i], var->members[i]); - } + /* It's a struct. Set it up as per-member. */ + var->var->num_members = glsl_get_length(interface_type->type); + var->var->members = rzalloc_array(var->var, struct nir_variable_data, + var->var->num_members); + + for (unsigned i = 0; i < var->var->num_members; i++) { + var->var->members[i].mode = nir_mode; + var->var->members[i].patch = var->patch; } - - initializer = NULL; - } else { - var->var = rzalloc(b->shader, nir_variable); - var->var->name = ralloc_strdup(var->var, val->name); - var->var->type = var->type->type; - var->var->interface_type = interface_type->type; - var->var->data.mode = nir_mode; - var->var->data.patch = var->patch; } /* For inputs and outputs, we need to grab locations and builtin @@ -1873,9 +2040,6 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, break; } - case vtn_variable_mode_param: - vtn_fail("Not created through OpVariable"); - case vtn_variable_mode_ubo: case vtn_variable_mode_ssbo: case vtn_variable_mode_push_constant: @@ -1890,30 +2054,25 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val, vtn_foreach_decoration(b, val, var_decoration_cb, var); - if (var->mode == vtn_variable_mode_image || - var->mode == vtn_variable_mode_sampler) { + if (var->mode == vtn_variable_mode_uniform) { /* XXX: We still need the binding information in the nir_variable * for these. We should fix that. */ var->var->data.binding = var->binding; + var->var->data.explicit_binding = var->explicit_binding; var->var->data.descriptor_set = var->descriptor_set; var->var->data.index = var->input_attachment_index; + var->var->data.offset = var->offset; - if (var->mode == vtn_variable_mode_image) + if (glsl_type_is_image(without_array->type)) var->var->data.image.format = without_array->image_format; } if (var->mode == vtn_variable_mode_local) { - vtn_assert(var->members == NULL && var->var != NULL); + vtn_assert(var->var != NULL && var->var->members == NULL); nir_function_impl_add_variable(b->nb.impl, var->var); } else if (var->var) { nir_shader_add_variable(b->shader, var->var); - } else if (var->members) { - unsigned count = glsl_get_length(without_array->type); - for (unsigned i = 0; i < count; i++) { - vtn_assert(var->members[i]->data.mode != nir_var_local); - nir_shader_add_variable(b->shader, var->members[i]); - } } else { vtn_assert(vtn_pointer_is_external_block(b, val->pointer)); } @@ -1985,7 +2144,22 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, struct vtn_value *link_val = vtn_untyped_value(b, w[i]); if (link_val->value_type == vtn_value_type_constant) { chain->link[idx].mode = vtn_access_mode_literal; - chain->link[idx].id = link_val->constant->values[0].u32[0]; + switch (glsl_get_bit_size(link_val->type->type)) { + case 8: + chain->link[idx].id = link_val->constant->values[0].i8[0]; + break; + case 16: + chain->link[idx].id = link_val->constant->values[0].i16[0]; + break; + case 32: + chain->link[idx].id = link_val->constant->values[0].i32[0]; + break; + case 64: + chain->link[idx].id = link_val->constant->values[0].i64[0]; + break; + default: + vtn_fail("Invalid bit size"); + } } else { chain->link[idx].mode = vtn_access_mode_id; chain->link[idx].id = w[i]; @@ -2039,8 +2213,8 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, vtn_assert_types_equal(b, opcode, res_type, src_val->type->deref); - if (src->mode == vtn_variable_mode_image || - src->mode == vtn_variable_mode_sampler) { + if (glsl_type_is_image(res_type->type) || + glsl_type_is_sampler(res_type->type)) { vtn_push_value(b, w[2], vtn_value_type_pointer)->pointer = src; return; }