return chain;
}
+static 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 ||
+ (ptr->mode == vtn_variable_mode_workgroup &&
+ b->options->lower_workgroup_access_to_offsets);
+}
+
+static bool
+vtn_pointer_is_external_block(struct vtn_builder *b,
+ struct vtn_pointer *ptr)
+{
+ return ptr->mode == vtn_variable_mode_ssbo ||
+ ptr->mode == vtn_variable_mode_ubo ||
+ ptr->mode == vtn_variable_mode_push_constant ||
+ (ptr->mode == vtn_variable_mode_workgroup &&
+ 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,
* pointers. For everything else, the client is expected to just pass us
* the right access chain.
*/
- assert(!deref_chain->ptr_as_array);
+ 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)) {
- assert(deref_chain->link[i].mode == vtn_access_mode_literal);
+ vtn_assert(deref_chain->link[i].mode == vtn_access_mode_literal);
type = type->members[deref_chain->link[i].id];
} else {
type = type->array_element;
vtn_access_link_as_ssa(struct vtn_builder *b, struct vtn_access_link link,
unsigned stride)
{
- assert(stride > 0);
+ vtn_assert(stride > 0);
if (link.mode == vtn_access_mode_literal) {
return nir_imm_int(&b->nb, link.id * stride);
} else if (stride == 1) {
- return vtn_ssa_value(b, link.id)->def;
+ nir_ssa_def *ssa = vtn_ssa_value(b, link.id)->def;
+ if (ssa->bit_size != 32)
+ ssa = nir_u2u32(&b->nb, ssa);
+ return ssa;
} else {
- return nir_imul(&b->nb, vtn_ssa_value(b, link.id)->def,
- nir_imm_int(&b->nb, stride));
+ 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 *desc_array_index)
{
if (!desc_array_index) {
- assert(glsl_type_is_struct(var->type->type));
+ vtn_assert(glsl_type_is_struct(var->type->type));
desc_array_index = nir_imm_int(&b->nb, 0);
}
return &instr->dest.ssa;
}
+static nir_ssa_def *
+vtn_resource_reindex(struct vtn_builder *b, 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_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL);
+ nir_builder_instr_insert(&b->nb, &instr->instr);
+
+ return &instr->dest.ssa;
+}
+
static struct vtn_pointer *
vtn_ssa_offset_pointer_dereference(struct vtn_builder *b,
struct vtn_pointer *base,
struct vtn_type *type = base->type;
unsigned idx = 0;
- if (deref_chain->ptr_as_array) {
+ if (base->mode == vtn_variable_mode_ubo ||
+ base->mode == vtn_variable_mode_ssbo) {
+ if (!block_index) {
+ vtn_assert(base->var && base->type);
+ nir_ssa_def *desc_arr_idx;
+ 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);
+ idx++;
+ /* This consumes a level of type */
+ type = type->array_element;
+ } else {
+ /* This is annoying. We've been asked for a pointer to the
+ * array of UBOs/SSBOs and not a specifc buffer. Return a
+ * pointer with a descriptor index of 0 and we'll have to do
+ * a reindex later to adjust it to the right thing.
+ */
+ desc_arr_idx = nir_imm_int(&b->nb, 0);
+ }
+ } 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);
+ } else {
+ /* We have a regular non-array SSBO. */
+ desc_arr_idx = NULL;
+ }
+ block_index = vtn_variable_resource_index(b, base->var, desc_arr_idx);
+ } else if (deref_chain->ptr_as_array &&
+ type->base_type == vtn_base_type_struct && type->block) {
+ /* We are doing an OpPtrAccessChain on a pointer to a struct that is
+ * decorated block. This is an interesting corner in the SPIR-V
+ * spec. One interpretation would be that they client is clearly
+ * trying to treat that block as if it's an implicit array of blocks
+ * repeated in the buffer. However, the SPIR-V spec for the
+ * OpPtrAccessChain says:
+ *
+ * "Base is treated as the address of the first element of an
+ * array, and the Element element’s address is computed to be the
+ * base for the Indexes, as per OpAccessChain."
+ *
+ * Taken literally, that would mean that your struct type is supposed
+ * to be treated as an array of such a struct and, since it's
+ * decorated block, that means an array of blocks which corresponds
+ * to an array descriptor. Therefore, we need to do a reindex
+ * operation to add the index from the first link in the access chain
+ * to the index we recieved.
+ *
+ * The downside to this interpretation (there always is one) is that
+ * this might be somewhat surprising behavior to apps if they expect
+ * the implicit array behavior described above.
+ */
+ vtn_assert(deref_chain->length >= 1);
+ nir_ssa_def *offset_index =
+ vtn_access_link_as_ssa(b, deref_chain->link[0], 1);
+ idx++;
+
+ block_index = vtn_resource_reindex(b, block_index, offset_index);
+ }
+ }
+
+ if (!offset) {
+ if (base->mode == vtn_variable_mode_workgroup) {
+ /* SLM doesn't need nor have a block index */
+ vtn_assert(!block_index);
+
+ /* We need the variable for the base offset */
+ vtn_assert(base->var);
+
+ /* We need ptr_type for size and alignment */
+ vtn_assert(base->ptr_type);
+
+ /* Assign location on first use so that we don't end up bloating SLM
+ * address space for variables which are never statically used.
+ */
+ if (base->var->shared_location < 0) {
+ vtn_assert(base->ptr_type->length > 0 && base->ptr_type->align > 0);
+ b->shader->num_shared = vtn_align_u32(b->shader->num_shared,
+ base->ptr_type->align);
+ base->var->shared_location = b->shader->num_shared;
+ b->shader->num_shared += base->ptr_type->length;
+ }
+
+ offset = nir_imm_int(&b->nb, base->var->shared_location);
+ } else {
+ /* The code above should have ensured a block_index when needed. */
+ vtn_assert(block_index);
+
+ /* Start off with at the start of the buffer. */
+ offset = nir_imm_int(&b->nb, 0);
+ }
+ }
+
+ if (deref_chain->ptr_as_array && idx == 0) {
/* We need ptr_type for the stride */
- assert(base->ptr_type);
- /* This must be a pointer to an actual element somewhere */
- assert(block_index && offset);
+ vtn_assert(base->ptr_type);
+
/* We need at least one element in the chain */
- assert(deref_chain->length >= 1);
+ vtn_assert(deref_chain->length >= 1);
nir_ssa_def *elem_offset =
vtn_access_link_as_ssa(b, deref_chain->link[idx],
idx++;
}
- if (!block_index) {
- assert(base->var);
- if (glsl_type_is_array(type->type)) {
- /* We need at least one element in the chain */
- assert(deref_chain->length >= 1);
-
- nir_ssa_def *desc_arr_idx =
- vtn_access_link_as_ssa(b, deref_chain->link[0], 1);
- block_index = vtn_variable_resource_index(b, base->var, desc_arr_idx);
- type = type->array_element;
- idx++;
- } else {
- block_index = vtn_variable_resource_index(b, base->var, NULL);
- }
-
- /* This is the first access chain so we also need an offset */
- assert(!offset);
- offset = nir_imm_int(&b->nb, 0);
- }
- assert(offset);
-
for (; idx < deref_chain->length; idx++) {
switch (glsl_get_base_type(type->type)) {
case GLSL_TYPE_UINT:
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_DOUBLE:
case GLSL_TYPE_BOOL:
case GLSL_TYPE_ARRAY: {
}
case GLSL_TYPE_STRUCT: {
- assert(deref_chain->link[idx].mode == vtn_access_mode_literal);
+ 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);
}
default:
- unreachable("Invalid type for deref");
+ vtn_fail("Invalid type for deref");
}
}
struct vtn_pointer *base,
struct vtn_access_chain *deref_chain)
{
- if (base->mode == vtn_variable_mode_ubo ||
- base->mode == vtn_variable_mode_ssbo) {
+ 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);
* tail_type. This is useful for split structures.
*/
static void
-rewrite_deref_types(nir_deref *deref, const struct glsl_type *type)
+rewrite_deref_types(struct vtn_builder *b, nir_deref *deref,
+ const struct glsl_type *type)
{
deref->type = type;
if (deref->child) {
- assert(deref->child->deref_type == nir_deref_type_array);
- assert(glsl_type_is_array(deref->type));
- rewrite_deref_types(deref->child, glsl_get_array_element(type));
+ 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));
}
}
pointer->mode = var->mode;
pointer->type = var->type;
- assert(ptr_type->base_type == vtn_base_type_pointer);
- assert(ptr_type->deref->type == var->type->type);
+ vtn_assert(ptr_type->base_type == vtn_base_type_pointer);
+ vtn_assert(ptr_type->deref->type == var->type->type);
pointer->ptr_type = ptr_type;
pointer->var = var;
if (!ptr->chain)
return deref_var;
} else {
- assert(ptr->var->members);
+ 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;
}
struct vtn_access_chain *chain = ptr->chain;
- assert(chain);
+ vtn_assert(chain);
struct vtn_type *deref_type = ptr->var->type;
nir_deref *tail = &deref_var->deref;
switch (base_type) {
case GLSL_TYPE_UINT:
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_DOUBLE:
case GLSL_TYPE_BOOL:
case GLSL_TYPE_ARRAY: {
deref_arr->deref_array_type = nir_deref_array_type_direct;
deref_arr->base_offset = chain->link[i].id;
} else {
- assert(chain->link[i].mode == vtn_access_mode_id);
+ 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 =
}
case GLSL_TYPE_STRUCT: {
- assert(chain->link[i].mode == vtn_access_mode_literal);
+ 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(&deref_var->deref, members[idx]->type);
- assert(tail->type == deref_type->type);
+ 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);
break;
}
default:
- unreachable("Invalid type for deref");
+ vtn_fail("Invalid type for deref");
}
}
- assert(members == NULL);
+ vtn_assert(members == NULL);
return deref_var;
}
_vtn_local_load_store(b, load, deref, tail->child, inout->elems[i]);
}
} else {
- assert(glsl_get_base_type(tail->type) == GLSL_TYPE_STRUCT);
+ 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;
if (src_tail->child) {
nir_deref_array *vec_deref = nir_deref_as_array(src_tail->child);
- assert(vec_deref->deref.child == NULL);
+ 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);
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);
- assert(deref->deref.child == NULL);
+ vtn_assert(deref->deref.child == NULL);
if (deref->deref_array_type == nir_deref_array_type_direct)
val->def = vtn_vector_insert(b, val->def, src->def,
deref->base_offset);
}
}
-static nir_ssa_def *
-get_vulkan_resource_index(struct vtn_builder *b, struct vtn_pointer *ptr,
- struct vtn_type **type, unsigned *chain_idx)
-{
- /* Push constants have no explicit binding */
- if (ptr->mode == vtn_variable_mode_push_constant) {
- *chain_idx = 0;
- *type = ptr->var->type;
- return NULL;
- }
-
- if (glsl_type_is_array(ptr->var->type->type)) {
- assert(ptr->chain->length > 0);
- nir_ssa_def *desc_array_index =
- vtn_access_link_as_ssa(b, ptr->chain->link[0], 1);
- *chain_idx = 1;
- *type = ptr->var->type->array_element;
- return vtn_variable_resource_index(b, ptr->var, desc_array_index);
- } else {
- *chain_idx = 0;
- *type = ptr->var->type;
- return vtn_variable_resource_index(b, ptr->var, NULL);
- }
-}
-
nir_ssa_def *
vtn_pointer_to_offset(struct vtn_builder *b, struct vtn_pointer *ptr,
nir_ssa_def **index_out, unsigned *end_idx_out)
{
- if (ptr->offset) {
- assert(ptr->block_index);
+ 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;
}
- unsigned idx = 0;
- struct vtn_type *type;
- *index_out = get_vulkan_resource_index(b, ptr, &type, &idx);
+ 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);
- 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_UINT64:
- case GLSL_TYPE_INT64:
- case GLSL_TYPE_FLOAT:
- 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: {
- 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;
- }
+ 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_UINT8:
+ case GLSL_TYPE_INT8:
+ 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:
- unreachable("Invalid type for deref");
+ default:
+ vtn_fail("Invalid type for deref");
+ }
}
}
- assert(type == ptr->type);
+ vtn_assert(type == ptr->type);
if (end_idx_out)
*end_idx_out = idx;
* offsets that are provided to us in the SPIR-V source.
*/
static unsigned
-vtn_type_block_size(struct vtn_type *type)
+vtn_type_block_size(struct vtn_builder *b, struct vtn_type *type)
{
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_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: {
unsigned cols = type->row_major ? glsl_get_vector_elements(type->type) :
glsl_get_matrix_columns(type->type);
if (cols > 1) {
- assert(type->stride > 0);
+ vtn_assert(type->stride > 0);
return type->stride * cols;
- } else if (base_type == GLSL_TYPE_DOUBLE ||
- base_type == GLSL_TYPE_UINT64 ||
- base_type == GLSL_TYPE_INT64) {
- return glsl_get_vector_elements(type->type) * 8;
} else {
- return glsl_get_vector_elements(type->type) * 4;
+ unsigned type_size = glsl_get_bit_size(type->type) / 8;
+ return glsl_get_vector_elements(type->type) * type_size;
}
}
unsigned num_fields = glsl_get_length(type->type);
for (unsigned f = 0; f < num_fields; f++) {
unsigned field_end = type->offsets[f] +
- vtn_type_block_size(type->members[f]);
+ vtn_type_block_size(b, type->members[f]);
size = MAX2(size, field_end);
}
return size;
}
case GLSL_TYPE_ARRAY:
- assert(type->stride > 0);
- assert(glsl_get_length(type->type) > 0);
+ vtn_assert(type->stride > 0);
+ vtn_assert(glsl_get_length(type->type) > 0);
return type->stride * glsl_get_length(type->type);
default:
- assert(!"Invalid block type");
+ vtn_fail("Invalid block type");
return 0;
}
}
static void
-vtn_access_chain_get_offset_size(struct vtn_access_chain *chain,
+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_size = vtn_type_block_size(type);
+ *access_size = vtn_type_block_size(b, type);
}
static void
}
if (op == nir_intrinsic_load_push_constant) {
- assert(access_offset % 4 == 0);
-
nir_intrinsic_set_base(instr, access_offset);
nir_intrinsic_set_range(instr, access_size);
}
switch (base_type) {
case GLSL_TYPE_UINT:
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_DOUBLE:
case GLSL_TYPE_BOOL:
/* This is where things get interesting. At this point, we've hit
unsigned type_size = glsl_get_bit_size(type->type) / 8;
if (elems == 1 || type->stride == type_size) {
/* This is a tightly-packed normal scalar or vector load */
- assert(glsl_type_is_vector_or_scalar(type->type));
+ 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);
/* This is a strided load. We have to load N things separately.
* This is the single column of a row-major matrix case.
*/
- assert(type->stride > type_size);
- assert(type->stride % type_size == 0);
+ vtn_assert(type->stride > type_size);
+ vtn_assert(type->stride % type_size == 0);
nir_ssa_def *per_comp[4];
for (unsigned i = 0; i < elems; i++) {
}
default:
- unreachable("Invalid block member type");
+ vtn_fail("Invalid block member type");
}
}
break;
case vtn_variable_mode_push_constant:
op = nir_intrinsic_load_push_constant;
- vtn_access_chain_get_offset_size(src->chain, src->var->type,
+ vtn_access_chain_get_offset_size(b, src->chain, src->var->type,
&access_offset, &access_size);
break;
+ case vtn_variable_mode_workgroup:
+ op = nir_intrinsic_load_shared;
+ break;
default:
- assert(!"Invalid block variable mode");
+ vtn_fail("Invalid block variable mode");
}
nir_ssa_def *offset, *index = NULL;
vtn_block_store(struct vtn_builder *b, struct vtn_ssa_value *src,
struct vtn_pointer *dst)
{
+ nir_intrinsic_op op;
+ switch (dst->mode) {
+ case vtn_variable_mode_ssbo:
+ op = nir_intrinsic_store_ssbo;
+ break;
+ case vtn_variable_mode_workgroup:
+ op = nir_intrinsic_store_shared;
+ break;
+ default:
+ vtn_fail("Invalid block variable mode");
+ }
+
nir_ssa_def *offset, *index = NULL;
unsigned chain_idx;
offset = vtn_pointer_to_offset(b, dst, &index, &chain_idx);
- _vtn_block_load_store(b, nir_intrinsic_store_ssbo, false, index, offset,
+ _vtn_block_load_store(b, op, false, index, offset,
0, 0, dst->chain, chain_idx, dst->type, &src);
}
-static bool
-vtn_pointer_is_external_block(struct vtn_pointer *ptr)
-{
- return ptr->mode == vtn_variable_mode_ssbo ||
- ptr->mode == vtn_variable_mode_ubo ||
- ptr->mode == vtn_variable_mode_push_constant;
-}
-
static void
_vtn_variable_load_store(struct vtn_builder *b, bool load,
struct vtn_pointer *ptr,
switch (base_type) {
case GLSL_TYPE_UINT:
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
case GLSL_TYPE_STRUCT: {
unsigned elems = glsl_get_length(ptr->type->type);
if (load) {
- assert(*inout == NULL);
+ vtn_assert(*inout == NULL);
*inout = rzalloc(b, struct vtn_ssa_value);
(*inout)->type = ptr->type->type;
(*inout)->elems = rzalloc_array(b, struct vtn_ssa_value *, elems);
}
default:
- unreachable("Invalid access chain type");
+ vtn_fail("Invalid access chain type");
}
}
struct vtn_ssa_value *
vtn_variable_load(struct vtn_builder *b, struct vtn_pointer *src)
{
- if (vtn_pointer_is_external_block(src)) {
+ if (vtn_pointer_is_external_block(b, src)) {
return vtn_block_load(b, src);
} else {
struct vtn_ssa_value *val = NULL;
vtn_variable_store(struct vtn_builder *b, struct vtn_ssa_value *src,
struct vtn_pointer *dest)
{
- if (vtn_pointer_is_external_block(dest)) {
- assert(dest->mode == vtn_variable_mode_ssbo);
+ if (vtn_pointer_is_external_block(b, dest)) {
+ vtn_assert(dest->mode == vtn_variable_mode_ssbo ||
+ dest->mode == vtn_variable_mode_workgroup);
vtn_block_store(b, src, dest);
} else {
_vtn_variable_load_store(b, false, dest, &src);
_vtn_variable_copy(struct vtn_builder *b, struct vtn_pointer *dest,
struct vtn_pointer *src)
{
- assert(src->type->type == dest->type->type);
+ vtn_assert(src->type->type == dest->type->type);
enum glsl_base_type base_type = glsl_get_base_type(src->type->type);
switch (base_type) {
case GLSL_TYPE_UINT:
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_DOUBLE:
case GLSL_TYPE_BOOL:
/* At this point, we have a scalar, vector, or matrix so we know that
}
default:
- unreachable("Invalid access chain type");
+ vtn_fail("Invalid access chain type");
}
}
}
static void
-set_mode_system_value(nir_variable_mode *mode)
+set_mode_system_value(struct vtn_builder *b, nir_variable_mode *mode)
{
- assert(*mode == nir_var_system_value || *mode == nir_var_shader_in);
+ vtn_assert(*mode == nir_var_system_value || *mode == nir_var_shader_in);
*mode = nir_var_system_value;
}
break;
case SpvBuiltInVertexIndex:
*location = SYSTEM_VALUE_VERTEX_ID;
- set_mode_system_value(mode);
+ 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.
*/
*location = SYSTEM_VALUE_VERTEX_ID_ZERO_BASE;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInInstanceIndex:
*location = SYSTEM_VALUE_INSTANCE_INDEX;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInInstanceId:
*location = SYSTEM_VALUE_INSTANCE_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInPrimitiveId:
- if (b->shader->stage == MESA_SHADER_FRAGMENT) {
- assert(*mode == nir_var_shader_in);
+ if (b->shader->info.stage == MESA_SHADER_FRAGMENT) {
+ vtn_assert(*mode == nir_var_shader_in);
*location = VARYING_SLOT_PRIMITIVE_ID;
} else if (*mode == nir_var_shader_out) {
*location = VARYING_SLOT_PRIMITIVE_ID;
} else {
*location = SYSTEM_VALUE_PRIMITIVE_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
}
break;
case SpvBuiltInInvocationId:
*location = SYSTEM_VALUE_INVOCATION_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInLayer:
*location = VARYING_SLOT_LAYER;
- if (b->shader->stage == MESA_SHADER_FRAGMENT)
+ if (b->shader->info.stage == MESA_SHADER_FRAGMENT)
*mode = nir_var_shader_in;
- else if (b->shader->stage == MESA_SHADER_GEOMETRY)
+ else if (b->shader->info.stage == MESA_SHADER_GEOMETRY)
+ *mode = nir_var_shader_out;
+ else if (b->options && b->options->caps.shader_viewport_index_layer &&
+ (b->shader->info.stage == MESA_SHADER_VERTEX ||
+ b->shader->info.stage == MESA_SHADER_TESS_EVAL))
*mode = nir_var_shader_out;
else
- unreachable("invalid stage for SpvBuiltInLayer");
+ vtn_fail("invalid stage for SpvBuiltInLayer");
break;
case SpvBuiltInViewportIndex:
*location = VARYING_SLOT_VIEWPORT;
- if (b->shader->stage == MESA_SHADER_GEOMETRY)
+ if (b->shader->info.stage == MESA_SHADER_GEOMETRY)
+ *mode = nir_var_shader_out;
+ else if (b->options && b->options->caps.shader_viewport_index_layer &&
+ (b->shader->info.stage == MESA_SHADER_VERTEX ||
+ b->shader->info.stage == MESA_SHADER_TESS_EVAL))
*mode = nir_var_shader_out;
- else if (b->shader->stage == MESA_SHADER_FRAGMENT)
+ else if (b->shader->info.stage == MESA_SHADER_FRAGMENT)
*mode = nir_var_shader_in;
else
- unreachable("invalid stage for SpvBuiltInViewportIndex");
+ vtn_fail("invalid stage for SpvBuiltInViewportIndex");
break;
case SpvBuiltInTessLevelOuter:
*location = VARYING_SLOT_TESS_LEVEL_OUTER;
break;
case SpvBuiltInTessCoord:
*location = SYSTEM_VALUE_TESS_COORD;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInPatchVertices:
*location = SYSTEM_VALUE_VERTICES_IN;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInFragCoord:
*location = VARYING_SLOT_POS;
- assert(*mode == nir_var_shader_in);
+ vtn_assert(*mode == nir_var_shader_in);
break;
case SpvBuiltInPointCoord:
*location = VARYING_SLOT_PNTC;
- assert(*mode == nir_var_shader_in);
+ vtn_assert(*mode == nir_var_shader_in);
break;
case SpvBuiltInFrontFacing:
*location = SYSTEM_VALUE_FRONT_FACE;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInSampleId:
*location = SYSTEM_VALUE_SAMPLE_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInSamplePosition:
*location = SYSTEM_VALUE_SAMPLE_POS;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInSampleMask:
if (*mode == nir_var_shader_out) {
*location = FRAG_RESULT_SAMPLE_MASK;
} else {
*location = SYSTEM_VALUE_SAMPLE_MASK_IN;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
}
break;
case SpvBuiltInFragDepth:
*location = FRAG_RESULT_DEPTH;
- assert(*mode == nir_var_shader_out);
+ vtn_assert(*mode == nir_var_shader_out);
+ break;
+ case SpvBuiltInHelperInvocation:
+ *location = SYSTEM_VALUE_HELPER_INVOCATION;
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInNumWorkgroups:
*location = SYSTEM_VALUE_NUM_WORK_GROUPS;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInWorkgroupSize:
- /* This should already be handled */
- unreachable("unsupported builtin");
+ *location = SYSTEM_VALUE_LOCAL_GROUP_SIZE;
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInWorkgroupId:
*location = SYSTEM_VALUE_WORK_GROUP_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInLocalInvocationId:
*location = SYSTEM_VALUE_LOCAL_INVOCATION_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInLocalInvocationIndex:
*location = SYSTEM_VALUE_LOCAL_INVOCATION_INDEX;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInGlobalInvocationId:
*location = SYSTEM_VALUE_GLOBAL_INVOCATION_ID;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInBaseVertex:
- *location = SYSTEM_VALUE_BASE_VERTEX;
- set_mode_system_value(mode);
+ /* 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:
*location = SYSTEM_VALUE_BASE_INSTANCE;
- set_mode_system_value(mode);
+ set_mode_system_value(b, mode);
break;
case SpvBuiltInDrawIndex:
*location = SYSTEM_VALUE_DRAW_ID;
- set_mode_system_value(mode);
+ 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(mode);
+ 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 SpvBuiltInHelperInvocation:
default:
- unreachable("unsupported builtin");
+ vtn_fail("unsupported builtin");
}
}
nir_var->data.invariant = true;
break;
case SpvDecorationConstant:
- assert(nir_var->constant_initializer != NULL);
+ vtn_assert(nir_var->constant_initializer != NULL);
nir_var->data.read_only = true;
break;
case SpvDecorationNonReadable:
nir_var->data.read_only = true;
nir_var->data.image.read_only = true;
break;
+ case SpvDecorationRestrict:
+ nir_var->data.image.restrict_flag = true;
+ break;
+ case SpvDecorationVolatile:
+ nir_var->data.image._volatile = true;
+ break;
+ case SpvDecorationCoherent:
+ nir_var->data.image.coherent = true;
+ break;
case SpvDecorationComponent:
nir_var->data.location_frac = 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;
case SpvBuiltInTessLevelInner:
nir_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;
+ /* fallthrough */
+ case SpvBuiltInSamplePosition:
+ nir_var->data.origin_upper_left = b->origin_upper_left;
break;
default:
break;
case SpvDecorationRowMajor:
case SpvDecorationColMajor:
case SpvDecorationMatrixStride:
- case SpvDecorationRestrict:
case SpvDecorationAliased:
- case SpvDecorationVolatile:
- case SpvDecorationCoherent:
case SpvDecorationUniform:
case SpvDecorationStream:
case SpvDecorationOffset:
break;
case SpvDecorationLocation:
- unreachable("Handled above");
+ vtn_fail("Handled above");
case SpvDecorationBlock:
case SpvDecorationBufferBlock:
break;
default:
- unreachable("Unhandled decoration");
+ vtn_fail("Unhandled decoration");
}
}
if (dec->decoration == SpvDecorationLocation) {
unsigned location = dec->literals[0];
bool is_vertex_input;
- if (b->shader->stage == MESA_SHADER_FRAGMENT &&
+ 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->stage == MESA_SHADER_VERTEX &&
+ } else if (b->shader->info.stage == MESA_SHADER_VERTEX &&
vtn_var->mode == vtn_variable_mode_input) {
is_vertex_input = true;
location += VERT_ATTRIB_GENERIC0;
return;
} else {
if (vtn_var->var) {
- assert(member <= 0);
+ assert(member == -1);
apply_var_decoration(b, vtn_var->var, dec);
} else if (vtn_var->members) {
if (member >= 0) {
- assert(vtn_var->members);
+ /* Member decorations must come from a type */
+ assert(val->value_type == vtn_value_type_type);
apply_var_decoration(b, vtn_var->members[member], dec);
} else {
unsigned length =
* nir_variables associated with them. Fortunately, all decorations
* we care about for those variables are on the type only.
*/
- assert(vtn_var->mode == vtn_variable_mode_ubo ||
- vtn_var->mode == vtn_variable_mode_ssbo ||
- vtn_var->mode == vtn_variable_mode_push_constant);
+ vtn_assert(vtn_var->mode == vtn_variable_mode_ubo ||
+ vtn_var->mode == vtn_variable_mode_ssbo ||
+ vtn_var->mode == vtn_variable_mode_push_constant ||
+ (vtn_var->mode == vtn_variable_mode_workgroup &&
+ b->options->lower_workgroup_access_to_offsets));
}
}
}
static enum vtn_variable_mode
-vtn_storage_class_to_mode(SpvStorageClass class,
+vtn_storage_class_to_mode(struct vtn_builder *b,
+ SpvStorageClass class,
struct vtn_type *interface_type,
nir_variable_mode *nir_mode_out)
{
mode = vtn_variable_mode_ssbo;
nir_mode = 0;
} else {
- assert(!"Invalid uniform variable type");
+ vtn_fail("Invalid uniform variable type");
}
break;
case SpvStorageClassStorageBuffer:
mode = vtn_variable_mode_sampler;
nir_mode = nir_var_uniform;
} else {
- assert(!"Invalid uniform constant variable type");
+ vtn_fail("Invalid uniform constant variable type");
}
break;
case SpvStorageClassPushConstant:
case SpvStorageClassGeneric:
case SpvStorageClassAtomicCounter:
default:
- unreachable("Unhandled variable storage class");
+ vtn_fail("Unhandled variable storage class");
}
if (nir_mode_out)
return mode;
}
+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 (!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);
+ }
+
+ 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;
+ }
+}
+
+struct vtn_pointer *
+vtn_pointer_from_ssa(struct vtn_builder *b, nir_ssa_def *ssa,
+ struct vtn_type *ptr_type)
+{
+ 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_pointer *ptr = rzalloc(b, struct vtn_pointer);
+ ptr->mode = vtn_storage_class_to_mode(b, ptr_type->storage_class,
+ ptr_type, NULL);
+ 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);
+ } else {
+ vtn_assert(ssa->num_components == 1);
+ vtn_assert(ptr->mode == vtn_variable_mode_workgroup);
+ ptr->block_index = NULL;
+ ptr->offset = ssa;
+ }
+
+ return ptr;
+}
+
static bool
is_per_vertex_inout(const struct vtn_variable *var, gl_shader_stage stage)
{
struct vtn_type *ptr_type, SpvStorageClass storage_class,
nir_constant *initializer)
{
- assert(ptr_type->base_type == vtn_base_type_pointer);
+ vtn_assert(ptr_type->base_type == vtn_base_type_pointer);
struct vtn_type *type = ptr_type->deref;
- assert(type->base_type != vtn_base_type_pointer);
struct vtn_type *without_array = type;
while(glsl_type_is_array(without_array->type))
enum vtn_variable_mode mode;
nir_variable_mode nir_mode;
- mode = vtn_storage_class_to_mode(storage_class, without_array, &nir_mode);
+ mode = vtn_storage_class_to_mode(b, storage_class, without_array, &nir_mode);
switch (mode) {
case vtn_variable_mode_ubo:
b->shader->info.num_textures++;
break;
case vtn_variable_mode_push_constant:
- b->shader->num_uniforms = vtn_type_block_size(type);
+ b->shader->num_uniforms = vtn_type_block_size(b, type);
break;
default:
/* No tallying is needed */
var->type = type;
var->mode = mode;
- assert(val->value_type == vtn_value_type_pointer);
+ vtn_assert(val->value_type == vtn_value_type_pointer);
val->pointer = vtn_pointer_for_variable(b, var, ptr_type);
switch (var->mode) {
case vtn_variable_mode_global:
case vtn_variable_mode_image:
case vtn_variable_mode_sampler:
- case vtn_variable_mode_workgroup:
/* For these, we create the variable normally */
var->var = rzalloc(b->shader, nir_variable);
var->var->name = ralloc_strdup(var->var, val->name);
}
break;
+ case vtn_variable_mode_workgroup:
+ if (b->options->lower_workgroup_access_to_offsets) {
+ var->shared_location = -1;
+ } else {
+ /* 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_var_shared;
+ }
+ break;
+
case vtn_variable_mode_input:
case vtn_variable_mode_output: {
/* In order to know whether or not we're a per-vertex inout, we need
vtn_foreach_decoration(b, val, var_is_patch_cb, &var->patch);
if (glsl_type_is_array(var->type->type) &&
glsl_type_is_struct(without_array->type)) {
- vtn_foreach_decoration(b, without_array->val,
+ vtn_foreach_decoration(b, vtn_value(b, without_array->id,
+ vtn_value_type_type),
var_is_patch_cb, &var->patch);
}
int array_length = -1;
struct vtn_type *interface_type = var->type;
- if (is_per_vertex_inout(var, b->shader->stage)) {
+ if (is_per_vertex_inout(var, b->shader->info.stage)) {
/* In Geometry shaders (and some tessellation), inputs come
* in per-vertex arrays. However, some builtins come in
* non-per-vertex, hence the need for the is_array check. In
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]);
+ }
}
+
+ initializer = NULL;
} else {
var->var = rzalloc(b->shader, nir_variable);
var->var->name = ralloc_strdup(var->var, val->name);
/* For inputs and outputs, we need to grab locations and builtin
* information from the interface type.
*/
- vtn_foreach_decoration(b, interface_type->val, var_decoration_cb, var);
+ vtn_foreach_decoration(b, vtn_value(b, interface_type->id,
+ vtn_value_type_type),
+ var_decoration_cb, var);
break;
}
case vtn_variable_mode_param:
- unreachable("Not created through OpVariable");
+ vtn_fail("Not created through OpVariable");
case vtn_variable_mode_ubo:
case vtn_variable_mode_ssbo:
}
if (var->mode == vtn_variable_mode_local) {
- assert(var->members == NULL && var->var != NULL);
- nir_function_impl_add_variable(b->impl, var->var);
+ vtn_assert(var->members == NULL && var->var != 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++) {
- assert(var->members[i]->data.mode != nir_var_local);
+ vtn_assert(var->members[i]->data.mode != nir_var_local);
nir_shader_add_variable(b->shader, var->members[i]);
}
} else {
- assert(var->mode == vtn_variable_mode_ubo ||
- var->mode == vtn_variable_mode_ssbo ||
- var->mode == vtn_variable_mode_push_constant);
+ vtn_assert(vtn_pointer_is_external_block(b, val->pointer));
+ }
+}
+
+static void
+vtn_assert_types_equal(struct vtn_builder *b, SpvOp opcode,
+ struct vtn_type *dst_type,
+ struct vtn_type *src_type)
+{
+ if (dst_type->id == src_type->id)
+ return;
+
+ if (vtn_types_compatible(b, dst_type, src_type)) {
+ /* Early versions of GLSLang would re-emit types unnecessarily and you
+ * would end up with OpLoad, OpStore, or OpCopyMemory opcodes which have
+ * mismatched source and destination types.
+ *
+ * https://github.com/KhronosGroup/glslang/issues/304
+ * https://github.com/KhronosGroup/glslang/issues/307
+ * https://bugs.freedesktop.org/show_bug.cgi?id=104338
+ * https://bugs.freedesktop.org/show_bug.cgi?id=104424
+ */
+ vtn_warn("Source and destination types of %s do not have the same "
+ "ID (but are compatible): %u vs %u",
+ spirv_op_to_string(opcode), dst_type->id, src_type->id);
+ return;
}
+
+ vtn_fail("Source and destination types of %s do not match: %s vs. %s",
+ spirv_op_to_string(opcode),
+ glsl_get_type_name(dst_type->type),
+ glsl_get_type_name(src_type->type));
}
void
struct vtn_value *val =
vtn_push_value(b, w[2], vtn_value_type_sampled_image);
val->sampled_image = ralloc(b, struct vtn_sampled_image);
+ val->sampled_image->type = base_val->sampled_image->type;
val->sampled_image->image =
vtn_pointer_dereference(b, base_val->sampled_image->image, chain);
val->sampled_image->sampler = base_val->sampled_image->sampler;
} else {
- assert(base_val->value_type == vtn_value_type_pointer);
+ vtn_assert(base_val->value_type == vtn_value_type_pointer);
struct vtn_value *val =
vtn_push_value(b, w[2], vtn_value_type_pointer);
val->pointer = vtn_pointer_dereference(b, base_val->pointer, chain);
struct vtn_value *dest = vtn_value(b, w[1], vtn_value_type_pointer);
struct vtn_value *src = vtn_value(b, w[2], vtn_value_type_pointer);
+ vtn_assert_types_equal(b, opcode, dest->type->deref, src->type->deref);
+
vtn_variable_copy(b, dest->pointer, src->pointer);
break;
}
case SpvOpLoad: {
struct vtn_type *res_type =
vtn_value(b, w[1], vtn_value_type_type)->type;
- struct vtn_pointer *src =
- vtn_value(b, w[3], vtn_value_type_pointer)->pointer;
+ struct vtn_value *src_val = vtn_value(b, w[3], vtn_value_type_pointer);
+ struct vtn_pointer *src = src_val->pointer;
+
+ 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) {
}
case SpvOpStore: {
- struct vtn_pointer *dest =
- vtn_value(b, w[1], vtn_value_type_pointer)->pointer;
+ struct vtn_value *dest_val = vtn_value(b, w[1], vtn_value_type_pointer);
+ struct vtn_pointer *dest = dest_val->pointer;
+ struct vtn_value *src_val = vtn_untyped_value(b, w[2]);
+
+ /* OpStore requires us to actually have a storage type */
+ vtn_fail_if(dest->type->type == NULL,
+ "Invalid destination type for OpStore");
+
+ if (glsl_get_base_type(dest->type->type) == GLSL_TYPE_BOOL &&
+ glsl_get_base_type(src_val->type->type) == GLSL_TYPE_UINT) {
+ /* Early versions of GLSLang would use uint types for UBOs/SSBOs but
+ * would then store them to a local variable as bool. Work around
+ * the issue by doing an implicit conversion.
+ *
+ * https://github.com/KhronosGroup/glslang/issues/170
+ * https://bugs.freedesktop.org/show_bug.cgi?id=104424
+ */
+ vtn_warn("OpStore of value of type OpTypeInt to a pointer to type "
+ "OpTypeBool. Doing an implicit conversion to work around "
+ "the problem.");
+ struct vtn_ssa_value *bool_ssa =
+ vtn_create_ssa_value(b, dest->type->type);
+ bool_ssa->def = nir_i2b(&b->nb, vtn_ssa_value(b, w[2])->def);
+ vtn_variable_store(b, bool_ssa, dest);
+ break;
+ }
+
+ vtn_assert_types_equal(b, opcode, dest_val->type->deref, src_val->type);
if (glsl_type_is_sampler(dest->type->type)) {
vtn_warn("OpStore of a sampler detected. Doing on-the-fly copy "
"propagation to workaround the problem.");
- assert(dest->var->copy_prop_sampler == NULL);
+ vtn_assert(dest->var->copy_prop_sampler == NULL);
dest->var->copy_prop_sampler =
vtn_value(b, w[2], vtn_value_type_pointer)->pointer;
break;
const uint32_t offset = ptr->var->type->offsets[w[4]];
const uint32_t stride = ptr->var->type->members[w[4]]->stride;
- unsigned chain_idx;
- struct vtn_type *type;
- nir_ssa_def *index =
- get_vulkan_resource_index(b, ptr, &type, &chain_idx);
+ if (!ptr->block_index) {
+ struct vtn_access_chain chain = {
+ .length = 0,
+ };
+ ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain);
+ vtn_assert(ptr->block_index);
+ }
nir_intrinsic_instr *instr =
nir_intrinsic_instr_create(b->nb.shader,
nir_intrinsic_get_buffer_size);
- instr->src[0] = nir_src_for_ssa(index);
+ instr->src[0] = nir_src_for_ssa(ptr->block_index);
nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL);
nir_builder_instr_insert(&b->nb, &instr->instr);
nir_ssa_def *buf_size = &instr->dest.ssa;
case SpvOpCopyMemorySized:
default:
- unreachable("Unhandled opcode");
+ vtn_fail("Unhandled opcode");
}
}
projects / mesa.git / blobdiff