2016-01-21 01:40:49 +00:00
|
|
|
|
/*
|
|
|
|
|
* Copyright © 2015 Intel Corporation
|
|
|
|
|
*
|
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
|
*
|
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
|
* Software.
|
|
|
|
|
*
|
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
|
*
|
|
|
|
|
* Authors:
|
|
|
|
|
* Jason Ekstrand (jason@jlekstrand.net)
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "vtn_private.h"
|
2016-06-02 22:34:15 +01:00
|
|
|
|
#include "spirv_info.h"
|
2018-03-16 20:35:59 +00:00
|
|
|
|
#include "nir_deref.h"
|
2018-12-13 22:50:19 +00:00
|
|
|
|
#include <vulkan/vulkan_core.h>
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:33 +01:00
|
|
|
|
static struct vtn_access_chain *
|
|
|
|
|
vtn_access_chain_create(struct vtn_builder *b, unsigned length)
|
|
|
|
|
{
|
|
|
|
|
struct vtn_access_chain *chain;
|
|
|
|
|
|
|
|
|
|
/* Subtract 1 from the length since there's already one built in */
|
|
|
|
|
size_t size = sizeof(*chain) +
|
|
|
|
|
(MAX2(length, 1) - 1) * sizeof(chain->link[0]);
|
|
|
|
|
chain = rzalloc_size(b, size);
|
|
|
|
|
chain->length = length;
|
|
|
|
|
|
|
|
|
|
return chain;
|
|
|
|
|
}
|
|
|
|
|
|
2018-12-15 00:20:00 +00:00
|
|
|
|
bool
|
2017-10-19 01:38:57 +01:00
|
|
|
|
vtn_pointer_uses_ssa_offset(struct vtn_builder *b,
|
|
|
|
|
struct vtn_pointer *ptr)
|
|
|
|
|
{
|
2018-12-15 00:36:01 +00:00
|
|
|
|
return ((ptr->mode == vtn_variable_mode_ubo ||
|
|
|
|
|
ptr->mode == vtn_variable_mode_ssbo) &&
|
|
|
|
|
b->options->lower_ubo_ssbo_access_to_offsets) ||
|
2018-03-22 15:50:34 +00:00
|
|
|
|
ptr->mode == vtn_variable_mode_push_constant ||
|
2017-10-19 01:59:47 +01:00
|
|
|
|
(ptr->mode == vtn_variable_mode_workgroup &&
|
|
|
|
|
b->options->lower_workgroup_access_to_offsets);
|
2017-10-19 01:38:57 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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 ||
|
2019-01-19 16:23:28 +00:00
|
|
|
|
ptr->mode == vtn_variable_mode_phys_ssbo ||
|
2017-10-19 01:59:47 +01:00
|
|
|
|
ptr->mode == vtn_variable_mode_push_constant ||
|
|
|
|
|
(ptr->mode == vtn_variable_mode_workgroup &&
|
|
|
|
|
b->options->lower_workgroup_access_to_offsets);
|
2017-10-19 01:38:57 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-12-14 17:06:07 +00:00
|
|
|
|
static nir_ssa_def *
|
|
|
|
|
vtn_access_link_as_ssa(struct vtn_builder *b, struct vtn_access_link link,
|
|
|
|
|
unsigned stride, unsigned bit_size)
|
|
|
|
|
{
|
|
|
|
|
vtn_assert(stride > 0);
|
|
|
|
|
if (link.mode == vtn_access_mode_literal) {
|
|
|
|
|
return nir_imm_intN_t(&b->nb, link.id * stride, bit_size);
|
|
|
|
|
} else {
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-12-13 22:50:19 +00:00
|
|
|
|
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");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-12 16:58:33 +00:00
|
|
|
|
static const struct glsl_type *
|
|
|
|
|
vtn_ptr_type_for_mode(struct vtn_builder *b, enum vtn_variable_mode mode)
|
|
|
|
|
{
|
|
|
|
|
switch (mode) {
|
|
|
|
|
case vtn_variable_mode_ubo:
|
|
|
|
|
return b->options->ubo_ptr_type;
|
|
|
|
|
case vtn_variable_mode_ssbo:
|
|
|
|
|
return b->options->ssbo_ptr_type;
|
|
|
|
|
default:
|
|
|
|
|
vtn_fail("Invalid mode for vulkan_resource_index");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:34 +01:00
|
|
|
|
static nir_ssa_def *
|
|
|
|
|
vtn_variable_resource_index(struct vtn_builder *b, struct vtn_variable *var,
|
|
|
|
|
nir_ssa_def *desc_array_index)
|
|
|
|
|
{
|
|
|
|
|
if (!desc_array_index) {
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(glsl_type_is_struct(var->type->type));
|
2017-06-29 18:33:34 +01:00
|
|
|
|
desc_array_index = nir_imm_int(&b->nb, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nir_intrinsic_instr *instr =
|
|
|
|
|
nir_intrinsic_instr_create(b->nb.shader,
|
|
|
|
|
nir_intrinsic_vulkan_resource_index);
|
|
|
|
|
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);
|
2018-12-13 22:50:19 +00:00
|
|
|
|
nir_intrinsic_set_desc_type(instr, vk_desc_type_for_mode(b, var->mode));
|
2017-06-29 18:33:34 +01:00
|
|
|
|
|
2019-01-12 16:58:33 +00:00
|
|
|
|
const struct glsl_type *index_type =
|
|
|
|
|
b->options->lower_ubo_ssbo_access_to_offsets ?
|
|
|
|
|
glsl_uint_type() : vtn_ptr_type_for_mode(b, var->mode);
|
|
|
|
|
|
|
|
|
|
instr->num_components = glsl_get_vector_elements(index_type);
|
|
|
|
|
nir_ssa_dest_init(&instr->instr, &instr->dest, instr->num_components,
|
|
|
|
|
glsl_get_bit_size(index_type), NULL);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
nir_builder_instr_insert(&b->nb, &instr->instr);
|
|
|
|
|
|
|
|
|
|
return &instr->dest.ssa;
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-01 00:55:45 +00:00
|
|
|
|
static nir_ssa_def *
|
2018-12-13 22:50:19 +00:00
|
|
|
|
vtn_resource_reindex(struct vtn_builder *b, enum vtn_variable_mode mode,
|
|
|
|
|
nir_ssa_def *base_index, nir_ssa_def *offset_index)
|
2017-12-01 00:55:45 +00:00
|
|
|
|
{
|
|
|
|
|
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);
|
2018-12-13 22:50:19 +00:00
|
|
|
|
nir_intrinsic_set_desc_type(instr, vk_desc_type_for_mode(b, mode));
|
2017-12-01 00:55:45 +00:00
|
|
|
|
|
2019-01-12 16:58:33 +00:00
|
|
|
|
const struct glsl_type *index_type =
|
|
|
|
|
b->options->lower_ubo_ssbo_access_to_offsets ?
|
|
|
|
|
glsl_uint_type() : vtn_ptr_type_for_mode(b, mode);
|
|
|
|
|
|
|
|
|
|
instr->num_components = glsl_get_vector_elements(index_type);
|
|
|
|
|
nir_ssa_dest_init(&instr->instr, &instr->dest, instr->num_components,
|
|
|
|
|
glsl_get_bit_size(index_type), NULL);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
nir_builder_instr_insert(&b->nb, &instr->instr);
|
|
|
|
|
|
|
|
|
|
return &instr->dest.ssa;
|
|
|
|
|
}
|
|
|
|
|
|
2018-12-15 00:36:01 +00:00
|
|
|
|
static nir_ssa_def *
|
|
|
|
|
vtn_descriptor_load(struct vtn_builder *b, enum vtn_variable_mode mode,
|
2019-01-12 16:58:33 +00:00
|
|
|
|
nir_ssa_def *desc_index)
|
2018-12-15 00:36:01 +00:00
|
|
|
|
{
|
|
|
|
|
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);
|
|
|
|
|
nir_intrinsic_set_desc_type(desc_load, vk_desc_type_for_mode(b, mode));
|
2019-01-12 16:58:33 +00:00
|
|
|
|
|
|
|
|
|
const struct glsl_type *ptr_type = vtn_ptr_type_for_mode(b, mode);
|
|
|
|
|
|
|
|
|
|
desc_load->num_components = glsl_get_vector_elements(ptr_type);
|
2018-12-15 00:36:01 +00:00
|
|
|
|
nir_ssa_dest_init(&desc_load->instr, &desc_load->dest,
|
|
|
|
|
desc_load->num_components,
|
2019-01-12 16:58:33 +00:00
|
|
|
|
glsl_get_bit_size(ptr_type), NULL);
|
2018-12-15 00:36:01 +00:00
|
|
|
|
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.
|
|
|
|
|
*/
|
2019-01-12 16:58:33 +00:00
|
|
|
|
nir_ssa_def *desc = vtn_descriptor_load(b, base->mode, block_index);
|
2018-12-15 00:36:01 +00:00
|
|
|
|
|
|
|
|
|
assert(base->mode == vtn_variable_mode_ssbo ||
|
|
|
|
|
base->mode == vtn_variable_mode_ubo);
|
|
|
|
|
nir_variable_mode nir_mode =
|
2019-01-15 23:11:23 +00:00
|
|
|
|
base->mode == vtn_variable_mode_ssbo ? nir_var_mem_ssbo : nir_var_mem_ubo;
|
2018-12-15 00:36:01 +00:00
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:34 +01:00
|
|
|
|
static struct vtn_pointer *
|
|
|
|
|
vtn_ssa_offset_pointer_dereference(struct vtn_builder *b,
|
|
|
|
|
struct vtn_pointer *base,
|
|
|
|
|
struct vtn_access_chain *deref_chain)
|
|
|
|
|
{
|
|
|
|
|
nir_ssa_def *block_index = base->block_index;
|
|
|
|
|
nir_ssa_def *offset = base->offset;
|
|
|
|
|
struct vtn_type *type = base->type;
|
2018-10-10 09:42:19 +01:00
|
|
|
|
enum gl_access_qualifier access = base->access;
|
2017-06-29 18:33:34 +01:00
|
|
|
|
|
|
|
|
|
unsigned idx = 0;
|
2017-12-01 00:55:45 +00:00
|
|
|
|
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 =
|
2018-12-14 17:06:07 +00:00
|
|
|
|
vtn_access_link_as_ssa(b, deref_chain->link[0], 1, 32);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
idx++;
|
|
|
|
|
/* This consumes a level of type */
|
|
|
|
|
type = type->array_element;
|
2018-10-10 09:42:19 +01:00
|
|
|
|
access |= type->access;
|
2017-12-01 00:55:45 +00:00
|
|
|
|
} 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);
|
2018-12-14 17:06:07 +00:00
|
|
|
|
desc_arr_idx = vtn_access_link_as_ssa(b, deref_chain->link[0], 1, 32);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
} 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 =
|
2018-12-14 17:06:07 +00:00
|
|
|
|
vtn_access_link_as_ssa(b, deref_chain->link[0], 1, 32);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
idx++;
|
2017-06-29 00:31:06 +01:00
|
|
|
|
|
2018-12-13 22:50:19 +00:00
|
|
|
|
block_index = vtn_resource_reindex(b, base->mode,
|
|
|
|
|
block_index, offset_index);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
}
|
2017-06-29 00:31:06 +01:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-19 00:40:39 +01:00
|
|
|
|
if (!offset) {
|
2017-12-01 00:55:45 +00:00
|
|
|
|
if (base->mode == vtn_variable_mode_workgroup) {
|
|
|
|
|
/* SLM doesn't need nor have a block index */
|
|
|
|
|
vtn_assert(!block_index);
|
2017-10-19 00:40:39 +01:00
|
|
|
|
|
2017-12-01 00:55:45 +00:00
|
|
|
|
/* We need the variable for the base offset */
|
|
|
|
|
vtn_assert(base->var);
|
2017-10-19 00:40:39 +01:00
|
|
|
|
|
2017-12-01 00:55:45 +00:00
|
|
|
|
/* We need ptr_type for size and alignment */
|
|
|
|
|
vtn_assert(base->ptr_type);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
|
2017-10-19 01:59:47 +01:00
|
|
|
|
/* 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) {
|
2017-12-01 00:55:45 +00:00
|
|
|
|
vtn_assert(base->ptr_type->length > 0 && base->ptr_type->align > 0);
|
2017-10-19 01:59:47 +01:00
|
|
|
|
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);
|
2018-03-22 15:50:34 +00:00
|
|
|
|
} 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);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
} else {
|
|
|
|
|
/* The code above should have ensured a block_index when needed. */
|
|
|
|
|
vtn_assert(block_index);
|
2017-10-19 01:59:47 +01:00
|
|
|
|
|
2017-12-01 00:55:45 +00:00
|
|
|
|
/* Start off with at the start of the buffer. */
|
|
|
|
|
offset = nir_imm_int(&b->nb, 0);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-12-01 00:55:45 +00:00
|
|
|
|
|
|
|
|
|
if (deref_chain->ptr_as_array && idx == 0) {
|
|
|
|
|
/* We need ptr_type for the stride */
|
|
|
|
|
vtn_assert(base->ptr_type);
|
|
|
|
|
|
|
|
|
|
/* We need at least one element in the chain */
|
|
|
|
|
vtn_assert(deref_chain->length >= 1);
|
|
|
|
|
|
|
|
|
|
nir_ssa_def *elem_offset =
|
|
|
|
|
vtn_access_link_as_ssa(b, deref_chain->link[idx],
|
2018-12-14 17:06:07 +00:00
|
|
|
|
base->ptr_type->stride, offset->bit_size);
|
2017-12-01 00:55:45 +00:00
|
|
|
|
offset = nir_iadd(&b->nb, offset, elem_offset);
|
|
|
|
|
idx++;
|
|
|
|
|
}
|
2017-06-29 18:33:34 +01:00
|
|
|
|
|
|
|
|
|
for (; idx < deref_chain->length; idx++) {
|
|
|
|
|
switch (glsl_get_base_type(type->type)) {
|
|
|
|
|
case GLSL_TYPE_UINT:
|
|
|
|
|
case GLSL_TYPE_INT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_UINT16:
|
|
|
|
|
case GLSL_TYPE_INT16:
|
2018-01-25 12:59:06 +00:00
|
|
|
|
case GLSL_TYPE_UINT8:
|
|
|
|
|
case GLSL_TYPE_INT8:
|
2017-06-29 18:33:34 +01:00
|
|
|
|
case GLSL_TYPE_UINT64:
|
|
|
|
|
case GLSL_TYPE_INT64:
|
|
|
|
|
case GLSL_TYPE_FLOAT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_FLOAT16:
|
2017-06-29 18:33:34 +01:00
|
|
|
|
case GLSL_TYPE_DOUBLE:
|
|
|
|
|
case GLSL_TYPE_BOOL:
|
|
|
|
|
case GLSL_TYPE_ARRAY: {
|
|
|
|
|
nir_ssa_def *elem_offset =
|
2018-12-14 17:06:07 +00:00
|
|
|
|
vtn_access_link_as_ssa(b, deref_chain->link[idx],
|
|
|
|
|
type->stride, offset->bit_size);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
offset = nir_iadd(&b->nb, offset, elem_offset);
|
|
|
|
|
type = type->array_element;
|
2018-10-10 09:42:19 +01:00
|
|
|
|
access |= type->access;
|
2017-06-29 18:33:34 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_STRUCT: {
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(deref_chain->link[idx].mode == vtn_access_mode_literal);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
unsigned member = deref_chain->link[idx].id;
|
2018-11-12 21:58:18 +00:00
|
|
|
|
offset = nir_iadd_imm(&b->nb, offset, type->offsets[member]);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
type = type->members[member];
|
2018-10-10 09:42:19 +01:00
|
|
|
|
access |= type->access;
|
2017-06-29 18:33:34 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Invalid type for deref");
|
2017-06-29 18:33:34 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct vtn_pointer *ptr = rzalloc(b, struct vtn_pointer);
|
|
|
|
|
ptr->mode = base->mode;
|
|
|
|
|
ptr->type = type;
|
|
|
|
|
ptr->block_index = block_index;
|
|
|
|
|
ptr->offset = offset;
|
2018-10-10 09:42:19 +01:00
|
|
|
|
ptr->access = access;
|
2017-06-29 18:33:34 +01:00
|
|
|
|
|
|
|
|
|
return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dereference the given base pointer by the access chain */
|
|
|
|
|
static struct vtn_pointer *
|
|
|
|
|
vtn_pointer_dereference(struct vtn_builder *b,
|
|
|
|
|
struct vtn_pointer *base,
|
|
|
|
|
struct vtn_access_chain *deref_chain)
|
|
|
|
|
{
|
2017-10-19 01:38:57 +01:00
|
|
|
|
if (vtn_pointer_uses_ssa_offset(b, base)) {
|
2017-06-29 18:33:34 +01:00
|
|
|
|
return vtn_ssa_offset_pointer_dereference(b, base, deref_chain);
|
|
|
|
|
} else {
|
2018-10-25 16:34:34 +01:00
|
|
|
|
return vtn_nir_deref_pointer_dereference(b, base, deref_chain);
|
2017-06-29 18:33:34 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:28 +01:00
|
|
|
|
struct vtn_pointer *
|
|
|
|
|
vtn_pointer_for_variable(struct vtn_builder *b,
|
2017-06-29 18:33:39 +01:00
|
|
|
|
struct vtn_variable *var, struct vtn_type *ptr_type)
|
2017-06-29 18:33:28 +01:00
|
|
|
|
{
|
|
|
|
|
struct vtn_pointer *pointer = rzalloc(b, struct vtn_pointer);
|
|
|
|
|
|
|
|
|
|
pointer->mode = var->mode;
|
|
|
|
|
pointer->type = var->type;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(ptr_type->base_type == vtn_base_type_pointer);
|
|
|
|
|
vtn_assert(ptr_type->deref->type == var->type->type);
|
2017-06-29 18:33:39 +01:00
|
|
|
|
pointer->ptr_type = ptr_type;
|
2017-06-29 18:33:28 +01:00
|
|
|
|
pointer->var = var;
|
2018-10-10 09:42:19 +01:00
|
|
|
|
pointer->access = var->access | var->type->access;
|
2017-06-29 18:33:28 +01:00
|
|
|
|
|
|
|
|
|
return pointer;
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-02 21:28:43 +01:00
|
|
|
|
/* 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)
|
|
|
|
|
{
|
|
|
|
|
assert(glsl_get_base_type(glsl_without_array(type)) == GLSL_TYPE_UINT);
|
|
|
|
|
assert(glsl_type_is_scalar(glsl_without_array(type)));
|
|
|
|
|
|
|
|
|
|
if (glsl_type_is_array(type)) {
|
|
|
|
|
const struct glsl_type *atomic =
|
|
|
|
|
repair_atomic_type(glsl_get_array_element(type));
|
|
|
|
|
|
2018-12-12 20:32:19 +00:00
|
|
|
|
return glsl_array_type(atomic, glsl_get_length(type),
|
|
|
|
|
glsl_get_explicit_stride(type));
|
2018-05-02 21:28:43 +01:00
|
|
|
|
} else {
|
|
|
|
|
return glsl_atomic_uint_type();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_deref_instr *
|
2017-06-29 18:33:28 +01:00
|
|
|
|
vtn_pointer_to_deref(struct vtn_builder *b, struct vtn_pointer *ptr)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2019-01-11 21:02:39 +00:00
|
|
|
|
if (b->wa_glslang_179) {
|
|
|
|
|
/* 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);
|
|
|
|
|
}
|
2017-06-20 17:06:44 +01:00
|
|
|
|
|
2018-10-25 16:34:34 +01:00
|
|
|
|
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);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-10-25 16:34:34 +01:00
|
|
|
|
return ptr->deref;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-16 20:35:59 +00:00
|
|
|
|
static void
|
|
|
|
|
_vtn_local_load_store(struct vtn_builder *b, bool load, nir_deref_instr *deref,
|
|
|
|
|
struct vtn_ssa_value *inout)
|
|
|
|
|
{
|
|
|
|
|
if (glsl_type_is_vector_or_scalar(deref->type)) {
|
2016-01-21 16:53:04 +00:00
|
|
|
|
if (load) {
|
2018-03-16 20:35:59 +00:00
|
|
|
|
inout->def = nir_load_deref(&b->nb, deref);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
} else {
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_store_deref(&b->nb, deref, inout->def, ~0);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
2018-03-16 20:35:59 +00:00
|
|
|
|
} else if (glsl_type_is_array(deref->type) ||
|
|
|
|
|
glsl_type_is_matrix(deref->type)) {
|
|
|
|
|
unsigned elems = glsl_get_length(deref->type);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
2018-03-16 20:35:59 +00:00
|
|
|
|
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]);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
} else {
|
2018-03-16 20:35:59 +00:00
|
|
|
|
vtn_assert(glsl_type_is_struct(deref->type));
|
|
|
|
|
unsigned elems = glsl_get_length(deref->type);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_deref_instr *child = nir_build_deref_struct(&b->nb, deref, i);
|
|
|
|
|
_vtn_local_load_store(b, load, child, inout->elems[i]);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_deref_instr *
|
2016-01-21 01:40:49 +00:00
|
|
|
|
vtn_nir_deref(struct vtn_builder *b, uint32_t id)
|
|
|
|
|
{
|
2017-06-29 18:33:28 +01:00
|
|
|
|
struct vtn_pointer *ptr = vtn_value(b, id, vtn_value_type_pointer)->pointer;
|
|
|
|
|
return vtn_pointer_to_deref(b, ptr);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Gets the NIR-level deref tail, which may have as a child an array deref
|
|
|
|
|
* selecting which component due to OpAccessChain supporting per-component
|
|
|
|
|
* indexing in SPIR-V.
|
|
|
|
|
*/
|
2018-03-16 20:35:59 +00:00
|
|
|
|
static nir_deref_instr *
|
|
|
|
|
get_deref_tail(nir_deref_instr *deref)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-03-16 20:35:59 +00:00
|
|
|
|
if (deref->deref_type != nir_deref_type_array)
|
|
|
|
|
return deref;
|
|
|
|
|
|
|
|
|
|
nir_deref_instr *parent =
|
|
|
|
|
nir_instr_as_deref(deref->parent.ssa->parent_instr);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2018-03-16 20:35:59 +00:00
|
|
|
|
if (glsl_type_is_vector(parent->type))
|
|
|
|
|
return parent;
|
|
|
|
|
else
|
|
|
|
|
return deref;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct vtn_ssa_value *
|
2018-03-16 20:35:59 +00:00
|
|
|
|
vtn_local_load(struct vtn_builder *b, nir_deref_instr *src)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_deref_instr *src_tail = get_deref_tail(src);
|
2016-01-21 16:53:04 +00:00
|
|
|
|
struct vtn_ssa_value *val = vtn_create_ssa_value(b, src_tail->type);
|
2018-03-16 20:35:59 +00:00
|
|
|
|
_vtn_local_load_store(b, true, src_tail, val);
|
|
|
|
|
|
|
|
|
|
if (src_tail != src) {
|
|
|
|
|
val->type = src->type;
|
2018-12-14 16:54:08 +00:00
|
|
|
|
if (nir_src_is_const(src->arr.index))
|
|
|
|
|
val->def = vtn_vector_extract(b, val->def,
|
|
|
|
|
nir_src_as_uint(src->arr.index));
|
2016-01-21 01:40:49 +00:00
|
|
|
|
else
|
2018-03-16 20:35:59 +00:00
|
|
|
|
val->def = vtn_vector_extract_dynamic(b, val->def, src->arr.index.ssa);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
vtn_local_store(struct vtn_builder *b, struct vtn_ssa_value *src,
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_deref_instr *dest)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-03-16 20:35:59 +00:00
|
|
|
|
nir_deref_instr *dest_tail = get_deref_tail(dest);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2018-03-16 20:35:59 +00:00
|
|
|
|
if (dest_tail != dest) {
|
2016-01-21 16:53:04 +00:00
|
|
|
|
struct vtn_ssa_value *val = vtn_create_ssa_value(b, dest_tail->type);
|
2018-03-16 20:35:59 +00:00
|
|
|
|
_vtn_local_load_store(b, true, dest_tail, val);
|
|
|
|
|
|
2018-12-14 16:54:08 +00:00
|
|
|
|
if (nir_src_is_const(dest->arr.index))
|
2016-01-21 01:40:49 +00:00
|
|
|
|
val->def = vtn_vector_insert(b, val->def, src->def,
|
2018-12-14 16:54:08 +00:00
|
|
|
|
nir_src_as_uint(dest->arr.index));
|
2016-01-21 01:40:49 +00:00
|
|
|
|
else
|
|
|
|
|
val->def = vtn_vector_insert_dynamic(b, val->def, src->def,
|
2018-03-16 20:35:59 +00:00
|
|
|
|
dest->arr.index.ssa);
|
|
|
|
|
_vtn_local_load_store(b, false, dest_tail, val);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
} else {
|
2018-03-16 20:35:59 +00:00
|
|
|
|
_vtn_local_load_store(b, false, dest_tail, src);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nir_ssa_def *
|
2017-06-29 18:33:28 +01:00
|
|
|
|
vtn_pointer_to_offset(struct vtn_builder *b, struct vtn_pointer *ptr,
|
2018-03-22 16:07:01 +00:00
|
|
|
|
nir_ssa_def **index_out)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-03-22 16:07:01 +00:00
|
|
|
|
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);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
2018-03-22 16:07:01 +00:00
|
|
|
|
*index_out = ptr->block_index;
|
|
|
|
|
return ptr->offset;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-12-17 22:25:37 +00:00
|
|
|
|
/* Tries to compute the size of an interface block based on the strides and
|
|
|
|
|
* offsets that are provided to us in the SPIR-V source.
|
|
|
|
|
*/
|
|
|
|
|
static unsigned
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_type_block_size(struct vtn_builder *b, struct vtn_type *type)
|
2016-12-17 22:25:37 +00:00
|
|
|
|
{
|
|
|
|
|
enum glsl_base_type base_type = glsl_get_base_type(type->type);
|
|
|
|
|
switch (base_type) {
|
|
|
|
|
case GLSL_TYPE_UINT:
|
|
|
|
|
case GLSL_TYPE_INT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_UINT16:
|
|
|
|
|
case GLSL_TYPE_INT16:
|
2018-01-25 12:59:06 +00:00
|
|
|
|
case GLSL_TYPE_UINT8:
|
|
|
|
|
case GLSL_TYPE_INT8:
|
2017-02-15 04:51:56 +00:00
|
|
|
|
case GLSL_TYPE_UINT64:
|
|
|
|
|
case GLSL_TYPE_INT64:
|
2016-12-17 22:25:37 +00:00
|
|
|
|
case GLSL_TYPE_FLOAT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_FLOAT16:
|
2016-12-17 22:25:37 +00:00
|
|
|
|
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) {
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(type->stride > 0);
|
2016-12-17 22:25:37 +00:00
|
|
|
|
return type->stride * cols;
|
|
|
|
|
} else {
|
2018-02-22 16:36:37 +00:00
|
|
|
|
unsigned type_size = glsl_get_bit_size(type->type) / 8;
|
|
|
|
|
return glsl_get_vector_elements(type->type) * type_size;
|
2016-12-17 22:25:37 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_STRUCT:
|
|
|
|
|
case GLSL_TYPE_INTERFACE: {
|
|
|
|
|
unsigned size = 0;
|
|
|
|
|
unsigned num_fields = glsl_get_length(type->type);
|
|
|
|
|
for (unsigned f = 0; f < num_fields; f++) {
|
|
|
|
|
unsigned field_end = type->offsets[f] +
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_type_block_size(b, type->members[f]);
|
2016-12-17 22:25:37 +00:00
|
|
|
|
size = MAX2(size, field_end);
|
|
|
|
|
}
|
|
|
|
|
return size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_ARRAY:
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(type->stride > 0);
|
|
|
|
|
vtn_assert(glsl_get_length(type->type) > 0);
|
2016-12-17 22:25:37 +00:00
|
|
|
|
return type->stride * glsl_get_length(type->type);
|
|
|
|
|
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Invalid block type");
|
2016-12-17 22:25:37 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
static void
|
|
|
|
|
_vtn_load_store_tail(struct vtn_builder *b, nir_intrinsic_op op, bool load,
|
|
|
|
|
nir_ssa_def *index, nir_ssa_def *offset,
|
2016-12-13 11:18:01 +00:00
|
|
|
|
unsigned access_offset, unsigned access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
struct vtn_ssa_value **inout, const struct glsl_type *type,
|
|
|
|
|
enum gl_access_qualifier access)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
|
|
|
|
nir_intrinsic_instr *instr = nir_intrinsic_instr_create(b->nb.shader, op);
|
|
|
|
|
instr->num_components = glsl_get_vector_elements(type);
|
|
|
|
|
|
2018-11-13 16:07:31 +00:00
|
|
|
|
/* 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);
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
int src = 0;
|
|
|
|
|
if (!load) {
|
2016-02-09 23:35:51 +00:00
|
|
|
|
nir_intrinsic_set_write_mask(instr, (1 << instr->num_components) - 1);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
instr->src[src++] = nir_src_for_ssa((*inout)->def);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (op == nir_intrinsic_load_push_constant) {
|
2016-12-13 11:18:01 +00:00
|
|
|
|
nir_intrinsic_set_base(instr, access_offset);
|
|
|
|
|
nir_intrinsic_set_range(instr, access_size);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-10-10 09:42:19 +01:00
|
|
|
|
if (op == nir_intrinsic_load_ssbo ||
|
|
|
|
|
op == nir_intrinsic_store_ssbo) {
|
|
|
|
|
nir_intrinsic_set_access(instr, access);
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-13 15:45:03 +00:00
|
|
|
|
/* 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);
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
if (index)
|
|
|
|
|
instr->src[src++] = nir_src_for_ssa(index);
|
|
|
|
|
|
2016-12-13 11:18:01 +00:00
|
|
|
|
if (op == nir_intrinsic_load_push_constant) {
|
|
|
|
|
/* We need to subtract the offset from where the intrinsic will load the
|
|
|
|
|
* data. */
|
|
|
|
|
instr->src[src++] =
|
|
|
|
|
nir_src_for_ssa(nir_isub(&b->nb, offset,
|
|
|
|
|
nir_imm_int(&b->nb, access_offset)));
|
|
|
|
|
} else {
|
|
|
|
|
instr->src[src++] = nir_src_for_ssa(offset);
|
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
|
|
|
|
if (load) {
|
|
|
|
|
nir_ssa_dest_init(&instr->instr, &instr->dest,
|
2018-11-13 16:07:31 +00:00
|
|
|
|
instr->num_components, data_bit_size, NULL);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
(*inout)->def = &instr->dest.ssa;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nir_builder_instr_insert(&b->nb, &instr->instr);
|
|
|
|
|
|
|
|
|
|
if (load && glsl_get_base_type(type) == GLSL_TYPE_BOOL)
|
|
|
|
|
(*inout)->def = nir_ine(&b->nb, (*inout)->def, nir_imm_int(&b->nb, 0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
_vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load,
|
|
|
|
|
nir_ssa_def *index, nir_ssa_def *offset,
|
2016-12-13 11:18:01 +00:00
|
|
|
|
unsigned access_offset, unsigned access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
struct vtn_type *type, enum gl_access_qualifier access,
|
|
|
|
|
struct vtn_ssa_value **inout)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-03-22 16:07:01 +00:00
|
|
|
|
if (load && *inout == NULL)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
*inout = vtn_create_ssa_value(b, 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:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_UINT16:
|
|
|
|
|
case GLSL_TYPE_INT16:
|
2018-01-25 12:59:06 +00:00
|
|
|
|
case GLSL_TYPE_UINT8:
|
|
|
|
|
case GLSL_TYPE_INT8:
|
2017-02-15 04:51:56 +00:00
|
|
|
|
case GLSL_TYPE_UINT64:
|
|
|
|
|
case GLSL_TYPE_INT64:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case GLSL_TYPE_FLOAT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_FLOAT16:
|
2016-11-10 09:07:09 +00:00
|
|
|
|
case GLSL_TYPE_DOUBLE:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case GLSL_TYPE_BOOL:
|
|
|
|
|
/* This is where things get interesting. At this point, we've hit
|
|
|
|
|
* a vector, a scalar, or a matrix.
|
|
|
|
|
*/
|
|
|
|
|
if (glsl_type_is_matrix(type->type)) {
|
2017-06-29 18:33:30 +01:00
|
|
|
|
/* Loading the whole matrix */
|
|
|
|
|
struct vtn_ssa_value *transpose;
|
|
|
|
|
unsigned num_ops, vec_width, col_stride;
|
|
|
|
|
if (type->row_major) {
|
|
|
|
|
num_ops = glsl_get_vector_elements(type->type);
|
|
|
|
|
vec_width = glsl_get_matrix_columns(type->type);
|
|
|
|
|
col_stride = type->array_element->stride;
|
|
|
|
|
if (load) {
|
|
|
|
|
const struct glsl_type *transpose_type =
|
|
|
|
|
glsl_matrix_type(base_type, vec_width, num_ops);
|
|
|
|
|
*inout = vtn_create_ssa_value(b, transpose_type);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
} else {
|
2017-06-29 18:33:30 +01:00
|
|
|
|
transpose = vtn_ssa_transpose(b, *inout);
|
|
|
|
|
inout = &transpose;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
2017-06-29 18:33:30 +01:00
|
|
|
|
} else {
|
|
|
|
|
num_ops = glsl_get_matrix_columns(type->type);
|
|
|
|
|
vec_width = glsl_get_vector_elements(type->type);
|
|
|
|
|
col_stride = type->stride;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < num_ops; i++) {
|
|
|
|
|
nir_ssa_def *elem_offset =
|
2018-11-12 21:58:18 +00:00
|
|
|
|
nir_iadd_imm(&b->nb, offset, i * col_stride);
|
2017-06-29 18:33:30 +01:00
|
|
|
|
_vtn_load_store_tail(b, op, load, index, elem_offset,
|
|
|
|
|
access_offset, access_size,
|
|
|
|
|
&(*inout)->elems[i],
|
2018-10-10 09:42:19 +01:00
|
|
|
|
glsl_vector_type(base_type, vec_width),
|
|
|
|
|
type->access | access);
|
2017-06-29 18:33:30 +01:00
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:30 +01:00
|
|
|
|
if (load && type->row_major)
|
|
|
|
|
*inout = vtn_ssa_transpose(b, *inout);
|
|
|
|
|
} else {
|
|
|
|
|
unsigned elems = glsl_get_vector_elements(type->type);
|
|
|
|
|
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 */
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(glsl_type_is_vector_or_scalar(type->type));
|
2017-06-29 18:33:30 +01:00
|
|
|
|
_vtn_load_store_tail(b, op, load, index, offset,
|
|
|
|
|
access_offset, access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
inout, type->type,
|
|
|
|
|
type->access | access);
|
2017-06-29 18:33:30 +01:00
|
|
|
|
} else {
|
|
|
|
|
/* This is a strided load. We have to load N things separately.
|
|
|
|
|
* This is the single column of a row-major matrix case.
|
|
|
|
|
*/
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(type->stride > type_size);
|
|
|
|
|
vtn_assert(type->stride % type_size == 0);
|
2017-06-29 18:33:30 +01:00
|
|
|
|
|
|
|
|
|
nir_ssa_def *per_comp[4];
|
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
2016-01-21 01:40:49 +00:00
|
|
|
|
nir_ssa_def *elem_offset =
|
2018-11-12 21:58:18 +00:00
|
|
|
|
nir_iadd_imm(&b->nb, offset, i * type->stride);
|
2017-06-29 18:33:30 +01:00
|
|
|
|
struct vtn_ssa_value *comp, temp_val;
|
|
|
|
|
if (!load) {
|
|
|
|
|
temp_val.def = nir_channel(&b->nb, (*inout)->def, i);
|
|
|
|
|
temp_val.type = glsl_scalar_type(base_type);
|
|
|
|
|
}
|
|
|
|
|
comp = &temp_val;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
_vtn_load_store_tail(b, op, load, index, elem_offset,
|
2016-12-13 11:18:01 +00:00
|
|
|
|
access_offset, access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
&comp, glsl_scalar_type(base_type),
|
|
|
|
|
type->access | access);
|
2017-06-29 18:33:30 +01:00
|
|
|
|
per_comp[i] = comp->def;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:30 +01:00
|
|
|
|
if (load) {
|
|
|
|
|
if (*inout == NULL)
|
|
|
|
|
*inout = vtn_create_ssa_value(b, type->type);
|
|
|
|
|
(*inout)->def = nir_vec(&b->nb, per_comp, elems);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_ARRAY: {
|
|
|
|
|
unsigned elems = glsl_get_length(type->type);
|
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
|
|
|
|
nir_ssa_def *elem_off =
|
2018-11-12 21:58:18 +00:00
|
|
|
|
nir_iadd_imm(&b->nb, offset, i * type->stride);
|
2016-12-13 11:18:01 +00:00
|
|
|
|
_vtn_block_load_store(b, op, load, index, elem_off,
|
|
|
|
|
access_offset, access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
type->array_element,
|
|
|
|
|
type->array_element->access | access,
|
|
|
|
|
&(*inout)->elems[i]);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_STRUCT: {
|
|
|
|
|
unsigned elems = glsl_get_length(type->type);
|
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
|
|
|
|
nir_ssa_def *elem_off =
|
2018-11-12 21:58:18 +00:00
|
|
|
|
nir_iadd_imm(&b->nb, offset, type->offsets[i]);
|
2016-12-13 11:18:01 +00:00
|
|
|
|
_vtn_block_load_store(b, op, load, index, elem_off,
|
|
|
|
|
access_offset, access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
type->members[i],
|
|
|
|
|
type->members[i]->access | access,
|
|
|
|
|
&(*inout)->elems[i]);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Invalid block member type");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct vtn_ssa_value *
|
2017-06-29 18:33:28 +01:00
|
|
|
|
vtn_block_load(struct vtn_builder *b, struct vtn_pointer *src)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
|
|
|
|
nir_intrinsic_op op;
|
2016-12-13 11:18:01 +00:00
|
|
|
|
unsigned access_offset = 0, access_size = 0;
|
2017-06-29 18:33:28 +01:00
|
|
|
|
switch (src->mode) {
|
2016-01-21 10:09:38 +00:00
|
|
|
|
case vtn_variable_mode_ubo:
|
|
|
|
|
op = nir_intrinsic_load_ubo;
|
|
|
|
|
break;
|
|
|
|
|
case vtn_variable_mode_ssbo:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
op = nir_intrinsic_load_ssbo;
|
2016-01-21 10:09:38 +00:00
|
|
|
|
break;
|
|
|
|
|
case vtn_variable_mode_push_constant:
|
|
|
|
|
op = nir_intrinsic_load_push_constant;
|
2018-03-22 15:50:34 +00:00
|
|
|
|
access_size = b->shader->num_uniforms;
|
2016-01-21 10:09:38 +00:00
|
|
|
|
break;
|
2017-10-19 01:59:47 +01:00
|
|
|
|
case vtn_variable_mode_workgroup:
|
|
|
|
|
op = nir_intrinsic_load_shared;
|
|
|
|
|
break;
|
2016-01-21 10:09:38 +00:00
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Invalid block variable mode");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nir_ssa_def *offset, *index = NULL;
|
2018-03-22 16:07:01 +00:00
|
|
|
|
offset = vtn_pointer_to_offset(b, src, &index);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
|
|
|
|
struct vtn_ssa_value *value = NULL;
|
|
|
|
|
_vtn_block_load_store(b, op, true, index, offset,
|
2016-12-13 11:18:01 +00:00
|
|
|
|
access_offset, access_size,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
src->type, src->access, &value);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
vtn_block_store(struct vtn_builder *b, struct vtn_ssa_value *src,
|
2017-06-29 18:33:28 +01:00
|
|
|
|
struct vtn_pointer *dst)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2017-10-19 00:36:04 +01:00
|
|
|
|
nir_intrinsic_op op;
|
|
|
|
|
switch (dst->mode) {
|
|
|
|
|
case vtn_variable_mode_ssbo:
|
|
|
|
|
op = nir_intrinsic_store_ssbo;
|
|
|
|
|
break;
|
2017-10-19 01:59:47 +01:00
|
|
|
|
case vtn_variable_mode_workgroup:
|
|
|
|
|
op = nir_intrinsic_store_shared;
|
|
|
|
|
break;
|
2017-10-19 00:36:04 +01:00
|
|
|
|
default:
|
|
|
|
|
vtn_fail("Invalid block variable mode");
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
nir_ssa_def *offset, *index = NULL;
|
2018-03-22 16:07:01 +00:00
|
|
|
|
offset = vtn_pointer_to_offset(b, dst, &index);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-10-19 00:36:04 +01:00
|
|
|
|
_vtn_block_load_store(b, op, false, index, offset,
|
2018-10-10 09:42:19 +01:00
|
|
|
|
0, 0, dst->type, dst->access, &src);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-01-21 18:58:53 +00:00
|
|
|
|
static void
|
|
|
|
|
_vtn_variable_load_store(struct vtn_builder *b, bool load,
|
2017-06-29 18:33:28 +01:00
|
|
|
|
struct vtn_pointer *ptr,
|
2016-01-21 18:58:53 +00:00
|
|
|
|
struct vtn_ssa_value **inout)
|
|
|
|
|
{
|
2017-06-29 18:33:28 +01:00
|
|
|
|
enum glsl_base_type base_type = glsl_get_base_type(ptr->type->type);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
switch (base_type) {
|
|
|
|
|
case GLSL_TYPE_UINT:
|
|
|
|
|
case GLSL_TYPE_INT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_UINT16:
|
|
|
|
|
case GLSL_TYPE_INT16:
|
2018-01-25 12:59:06 +00:00
|
|
|
|
case GLSL_TYPE_UINT8:
|
|
|
|
|
case GLSL_TYPE_INT8:
|
2017-02-15 04:51:56 +00:00
|
|
|
|
case GLSL_TYPE_UINT64:
|
|
|
|
|
case GLSL_TYPE_INT64:
|
2016-01-21 18:58:53 +00:00
|
|
|
|
case GLSL_TYPE_FLOAT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_FLOAT16:
|
2016-01-21 18:58:53 +00:00
|
|
|
|
case GLSL_TYPE_BOOL:
|
2016-11-08 15:55:46 +00:00
|
|
|
|
case GLSL_TYPE_DOUBLE:
|
2018-12-15 00:36:01 +00:00
|
|
|
|
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;
|
2016-01-21 18:58:53 +00:00
|
|
|
|
}
|
2018-12-15 00:36:01 +00:00
|
|
|
|
/* Fall through */
|
2016-01-21 18:58:53 +00:00
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_ARRAY:
|
|
|
|
|
case GLSL_TYPE_STRUCT: {
|
2017-06-29 18:33:28 +01:00
|
|
|
|
unsigned elems = glsl_get_length(ptr->type->type);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
if (load) {
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(*inout == NULL);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
*inout = rzalloc(b, struct vtn_ssa_value);
|
2017-06-29 18:33:28 +01:00
|
|
|
|
(*inout)->type = ptr->type->type;
|
2016-01-21 18:58:53 +00:00
|
|
|
|
(*inout)->elems = rzalloc_array(b, struct vtn_ssa_value *, elems);
|
|
|
|
|
}
|
2017-06-29 18:33:28 +01:00
|
|
|
|
|
2017-06-29 18:33:33 +01:00
|
|
|
|
struct vtn_access_chain chain = {
|
|
|
|
|
.length = 1,
|
|
|
|
|
.link = {
|
|
|
|
|
{ .mode = vtn_access_mode_literal, },
|
|
|
|
|
}
|
|
|
|
|
};
|
2016-01-21 18:58:53 +00:00
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
2017-06-29 18:33:33 +01:00
|
|
|
|
chain.link[0].id = i;
|
|
|
|
|
struct vtn_pointer *elem = vtn_pointer_dereference(b, ptr, &chain);
|
|
|
|
|
_vtn_variable_load_store(b, load, elem, &(*inout)->elems[i]);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Invalid access chain type");
|
2016-01-21 18:58:53 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
struct vtn_ssa_value *
|
2017-06-29 18:33:28 +01:00
|
|
|
|
vtn_variable_load(struct vtn_builder *b, struct vtn_pointer *src)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-12-15 00:25:38 +00:00
|
|
|
|
if (vtn_pointer_uses_ssa_offset(b, src)) {
|
2016-01-21 01:40:49 +00:00
|
|
|
|
return vtn_block_load(b, src);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
} else {
|
|
|
|
|
struct vtn_ssa_value *val = NULL;
|
2017-06-29 18:33:28 +01:00
|
|
|
|
_vtn_variable_load_store(b, true, src, &val);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
return val;
|
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
vtn_variable_store(struct vtn_builder *b, struct vtn_ssa_value *src,
|
2017-06-29 18:33:28 +01:00
|
|
|
|
struct vtn_pointer *dest)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2018-12-15 00:25:38 +00:00
|
|
|
|
if (vtn_pointer_uses_ssa_offset(b, dest)) {
|
2017-10-19 01:59:47 +01:00
|
|
|
|
vtn_assert(dest->mode == vtn_variable_mode_ssbo ||
|
|
|
|
|
dest->mode == vtn_variable_mode_workgroup);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
vtn_block_store(b, src, dest);
|
|
|
|
|
} else {
|
2017-06-29 18:33:28 +01:00
|
|
|
|
_vtn_variable_load_store(b, false, dest, &src);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2017-06-29 18:33:28 +01:00
|
|
|
|
_vtn_variable_copy(struct vtn_builder *b, struct vtn_pointer *dest,
|
|
|
|
|
struct vtn_pointer *src)
|
2016-01-21 18:58:53 +00:00
|
|
|
|
{
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(src->type->type == dest->type->type);
|
2017-06-29 18:33:28 +01:00
|
|
|
|
enum glsl_base_type base_type = glsl_get_base_type(src->type->type);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
switch (base_type) {
|
|
|
|
|
case GLSL_TYPE_UINT:
|
|
|
|
|
case GLSL_TYPE_INT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_UINT16:
|
|
|
|
|
case GLSL_TYPE_INT16:
|
2018-01-25 12:59:06 +00:00
|
|
|
|
case GLSL_TYPE_UINT8:
|
|
|
|
|
case GLSL_TYPE_INT8:
|
2017-02-15 04:51:56 +00:00
|
|
|
|
case GLSL_TYPE_UINT64:
|
|
|
|
|
case GLSL_TYPE_INT64:
|
2016-01-21 18:58:53 +00:00
|
|
|
|
case GLSL_TYPE_FLOAT:
|
2017-07-01 07:04:40 +01:00
|
|
|
|
case GLSL_TYPE_FLOAT16:
|
2016-11-10 11:07:53 +00:00
|
|
|
|
case GLSL_TYPE_DOUBLE:
|
2016-01-21 18:58:53 +00:00
|
|
|
|
case GLSL_TYPE_BOOL:
|
|
|
|
|
/* 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.
|
|
|
|
|
*/
|
|
|
|
|
vtn_variable_store(b, vtn_variable_load(b, src), dest);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case GLSL_TYPE_ARRAY:
|
|
|
|
|
case GLSL_TYPE_STRUCT: {
|
2017-06-29 18:33:33 +01:00
|
|
|
|
struct vtn_access_chain chain = {
|
|
|
|
|
.length = 1,
|
|
|
|
|
.link = {
|
|
|
|
|
{ .mode = vtn_access_mode_literal, },
|
|
|
|
|
}
|
|
|
|
|
};
|
2017-06-29 18:33:28 +01:00
|
|
|
|
unsigned elems = glsl_get_length(src->type->type);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
for (unsigned i = 0; i < elems; i++) {
|
2017-06-29 18:33:33 +01:00
|
|
|
|
chain.link[0].id = i;
|
|
|
|
|
struct vtn_pointer *src_elem =
|
|
|
|
|
vtn_pointer_dereference(b, src, &chain);
|
|
|
|
|
struct vtn_pointer *dest_elem =
|
|
|
|
|
vtn_pointer_dereference(b, dest, &chain);
|
|
|
|
|
|
|
|
|
|
_vtn_variable_copy(b, dest_elem, src_elem);
|
2016-01-21 18:58:53 +00:00
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Invalid access chain type");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2017-06-29 18:33:28 +01:00
|
|
|
|
vtn_variable_copy(struct vtn_builder *b, struct vtn_pointer *dest,
|
|
|
|
|
struct vtn_pointer *src)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2016-01-21 18:58:53 +00:00
|
|
|
|
/* TODO: At some point, we should add a special-case for when we can
|
|
|
|
|
* just emit a copy_var intrinsic.
|
|
|
|
|
*/
|
2017-06-29 18:33:28 +01:00
|
|
|
|
_vtn_variable_copy(b, dest, src);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(struct vtn_builder *b, nir_variable_mode *mode)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(*mode == nir_var_system_value || *mode == nir_var_shader_in);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
*mode = nir_var_system_value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
vtn_get_builtin_location(struct vtn_builder *b,
|
|
|
|
|
SpvBuiltIn builtin, int *location,
|
|
|
|
|
nir_variable_mode *mode)
|
|
|
|
|
{
|
|
|
|
|
switch (builtin) {
|
|
|
|
|
case SpvBuiltInPosition:
|
|
|
|
|
*location = VARYING_SLOT_POS;
|
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInPointSize:
|
|
|
|
|
*location = VARYING_SLOT_PSIZ;
|
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInClipDistance:
|
|
|
|
|
*location = VARYING_SLOT_CLIP_DIST0; /* XXX CLIP_DIST1? */
|
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInCullDistance:
|
2016-08-29 01:18:15 +01:00
|
|
|
|
*location = VARYING_SLOT_CULL_DIST0;
|
2016-01-22 00:03:06 +00:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInVertexId:
|
2018-04-19 16:17:41 +01:00
|
|
|
|
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.
|
2016-01-21 01:40:49 +00:00
|
|
|
|
*/
|
2018-04-19 16:17:41 +01:00
|
|
|
|
*location = SYSTEM_VALUE_VERTEX_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInInstanceIndex:
|
2016-01-26 19:48:23 +00:00
|
|
|
|
*location = SYSTEM_VALUE_INSTANCE_INDEX;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-26 19:48:23 +00:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInInstanceId:
|
|
|
|
|
*location = SYSTEM_VALUE_INSTANCE_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInPrimitiveId:
|
2017-09-15 03:52:38 +01:00
|
|
|
|
if (b->shader->info.stage == MESA_SHADER_FRAGMENT) {
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(*mode == nir_var_shader_in);
|
2017-01-09 11:31:53 +00:00
|
|
|
|
*location = VARYING_SLOT_PRIMITIVE_ID;
|
|
|
|
|
} else if (*mode == nir_var_shader_out) {
|
2016-11-11 06:31:32 +00:00
|
|
|
|
*location = VARYING_SLOT_PRIMITIVE_ID;
|
|
|
|
|
} else {
|
|
|
|
|
*location = SYSTEM_VALUE_PRIMITIVE_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-11-11 06:31:32 +00:00
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInInvocationId:
|
|
|
|
|
*location = SYSTEM_VALUE_INVOCATION_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInLayer:
|
|
|
|
|
*location = VARYING_SLOT_LAYER;
|
2017-09-15 03:52:38 +01:00
|
|
|
|
if (b->shader->info.stage == MESA_SHADER_FRAGMENT)
|
2016-12-02 13:16:07 +00:00
|
|
|
|
*mode = nir_var_shader_in;
|
2017-09-15 03:52:38 +01:00
|
|
|
|
else if (b->shader->info.stage == MESA_SHADER_GEOMETRY)
|
2016-12-02 13:16:07 +00:00
|
|
|
|
*mode = nir_var_shader_out;
|
2018-03-05 21:58:11 +00:00
|
|
|
|
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;
|
2016-12-02 13:16:07 +00:00
|
|
|
|
else
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("invalid stage for SpvBuiltInLayer");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInViewportIndex:
|
|
|
|
|
*location = VARYING_SLOT_VIEWPORT;
|
2017-09-15 03:52:38 +01:00
|
|
|
|
if (b->shader->info.stage == MESA_SHADER_GEOMETRY)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
*mode = nir_var_shader_out;
|
2018-03-05 21:58:11 +00:00
|
|
|
|
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;
|
2017-09-15 03:52:38 +01:00
|
|
|
|
else if (b->shader->info.stage == MESA_SHADER_FRAGMENT)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
*mode = nir_var_shader_in;
|
|
|
|
|
else
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("invalid stage for SpvBuiltInViewportIndex");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInTessLevelOuter:
|
2016-09-25 22:23:55 +01:00
|
|
|
|
*location = VARYING_SLOT_TESS_LEVEL_OUTER;
|
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInTessLevelInner:
|
2016-09-25 22:23:55 +01:00
|
|
|
|
*location = VARYING_SLOT_TESS_LEVEL_INNER;
|
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInTessCoord:
|
2016-09-25 22:23:55 +01:00
|
|
|
|
*location = SYSTEM_VALUE_TESS_COORD;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-09-25 22:23:55 +01:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInPatchVertices:
|
2016-09-25 22:23:55 +01:00
|
|
|
|
*location = SYSTEM_VALUE_VERTICES_IN;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-09-25 22:23:55 +01:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInFragCoord:
|
|
|
|
|
*location = VARYING_SLOT_POS;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(*mode == nir_var_shader_in);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInPointCoord:
|
|
|
|
|
*location = VARYING_SLOT_PNTC;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(*mode == nir_var_shader_in);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInFrontFacing:
|
2016-06-21 07:41:11 +01:00
|
|
|
|
*location = SYSTEM_VALUE_FRONT_FACE;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInSampleId:
|
|
|
|
|
*location = SYSTEM_VALUE_SAMPLE_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInSamplePosition:
|
|
|
|
|
*location = SYSTEM_VALUE_SAMPLE_POS;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInSampleMask:
|
2017-01-24 10:49:40 +00:00
|
|
|
|
if (*mode == nir_var_shader_out) {
|
|
|
|
|
*location = FRAG_RESULT_SAMPLE_MASK;
|
|
|
|
|
} else {
|
|
|
|
|
*location = SYSTEM_VALUE_SAMPLE_MASK_IN;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2017-01-24 10:49:40 +00:00
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInFragDepth:
|
|
|
|
|
*location = FRAG_RESULT_DEPTH;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(*mode == nir_var_shader_out);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
2017-08-22 06:11:49 +01:00
|
|
|
|
case SpvBuiltInHelperInvocation:
|
|
|
|
|
*location = SYSTEM_VALUE_HELPER_INVOCATION;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2017-08-22 06:11:49 +01:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvBuiltInNumWorkgroups:
|
|
|
|
|
*location = SYSTEM_VALUE_NUM_WORK_GROUPS;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInWorkgroupSize:
|
2018-03-22 00:20:00 +00:00
|
|
|
|
*location = SYSTEM_VALUE_LOCAL_GROUP_SIZE;
|
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInWorkgroupId:
|
|
|
|
|
*location = SYSTEM_VALUE_WORK_GROUP_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInLocalInvocationId:
|
|
|
|
|
*location = SYSTEM_VALUE_LOCAL_INVOCATION_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInLocalInvocationIndex:
|
|
|
|
|
*location = SYSTEM_VALUE_LOCAL_INVOCATION_INDEX;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInGlobalInvocationId:
|
|
|
|
|
*location = SYSTEM_VALUE_GLOBAL_INVOCATION_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
2019-01-14 17:36:37 +00:00
|
|
|
|
case SpvBuiltInGlobalLinearId:
|
|
|
|
|
*location = SYSTEM_VALUE_GLOBAL_INVOCATION_INDEX;
|
|
|
|
|
set_mode_system_value(b, mode);
|
|
|
|
|
break;
|
2017-01-25 13:58:14 +00:00
|
|
|
|
case SpvBuiltInBaseVertex:
|
2018-01-25 18:15:41 +00:00
|
|
|
|
/* 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;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2017-01-25 13:58:14 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInBaseInstance:
|
|
|
|
|
*location = SYSTEM_VALUE_BASE_INSTANCE;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2017-01-25 13:58:14 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvBuiltInDrawIndex:
|
|
|
|
|
*location = SYSTEM_VALUE_DRAW_ID;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2017-01-25 13:58:14 +00:00
|
|
|
|
break;
|
2017-04-28 12:45:50 +01:00
|
|
|
|
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;
|
2017-09-21 23:51:55 +01:00
|
|
|
|
case SpvBuiltInDeviceIndex:
|
|
|
|
|
*location = SYSTEM_VALUE_DEVICE_INDEX;
|
|
|
|
|
set_mode_system_value(b, mode);
|
|
|
|
|
break;
|
2017-03-21 22:24:25 +00:00
|
|
|
|
case SpvBuiltInViewIndex:
|
|
|
|
|
*location = SYSTEM_VALUE_VIEW_INDEX;
|
2017-08-17 01:38:13 +01:00
|
|
|
|
set_mode_system_value(b, mode);
|
2017-03-21 22:24:25 +00:00
|
|
|
|
break;
|
2017-08-23 00:53:05 +01:00
|
|
|
|
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;
|
2018-02-12 02:26:40 +00:00
|
|
|
|
case SpvBuiltInFragStencilRefEXT:
|
|
|
|
|
*location = FRAG_RESULT_STENCIL;
|
|
|
|
|
vtn_assert(*mode == nir_var_shader_out);
|
|
|
|
|
break;
|
2018-03-08 19:18:59 +00:00
|
|
|
|
case SpvBuiltInWorkDim:
|
|
|
|
|
*location = SYSTEM_VALUE_WORK_DIM;
|
|
|
|
|
set_mode_system_value(b, mode);
|
|
|
|
|
break;
|
2018-02-22 22:35:50 +00:00
|
|
|
|
case SpvBuiltInGlobalSize:
|
|
|
|
|
*location = SYSTEM_VALUE_GLOBAL_GROUP_SIZE;
|
|
|
|
|
set_mode_system_value(b, mode);
|
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
default:
|
2018-07-12 00:18:23 +01:00
|
|
|
|
vtn_fail("unsupported builtin: %u", builtin);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2018-03-22 00:24:07 +00:00
|
|
|
|
apply_var_decoration(struct vtn_builder *b,
|
|
|
|
|
struct nir_variable_data *var_data,
|
2016-09-07 02:33:14 +01:00
|
|
|
|
const struct vtn_decoration *dec)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
|
|
|
|
switch (dec->decoration) {
|
|
|
|
|
case SpvDecorationRelaxedPrecision:
|
|
|
|
|
break; /* FIXME: Do nothing with this for now. */
|
|
|
|
|
case SpvDecorationNoPerspective:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->interpolation = INTERP_MODE_NOPERSPECTIVE;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationFlat:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->interpolation = INTERP_MODE_FLAT;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationCentroid:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->centroid = true;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationSample:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->sample = true;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationInvariant:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->invariant = true;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationConstant:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->read_only = true;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
2017-02-14 10:34:48 +00:00
|
|
|
|
case SpvDecorationNonReadable:
|
2018-08-16 21:11:12 +01:00
|
|
|
|
var_data->image.access |= ACCESS_NON_READABLE;
|
2017-02-14 10:34:48 +00:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvDecorationNonWritable:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->read_only = true;
|
2018-08-16 21:11:12 +01:00
|
|
|
|
var_data->image.access |= ACCESS_NON_WRITEABLE;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
2018-02-22 09:25:37 +00:00
|
|
|
|
case SpvDecorationRestrict:
|
2018-08-16 21:11:12 +01:00
|
|
|
|
var_data->image.access |= ACCESS_RESTRICT;
|
2018-02-22 09:25:37 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationVolatile:
|
2018-08-16 21:11:12 +01:00
|
|
|
|
var_data->image.access |= ACCESS_VOLATILE;
|
2018-02-22 09:25:37 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationCoherent:
|
2018-08-16 21:11:12 +01:00
|
|
|
|
var_data->image.access |= ACCESS_COHERENT;
|
2018-02-22 09:25:37 +00:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvDecorationComponent:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->location_frac = dec->literals[0];
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationIndex:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->index = dec->literals[0];
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
case SpvDecorationBuiltIn: {
|
|
|
|
|
SpvBuiltIn builtin = dec->literals[0];
|
|
|
|
|
|
2018-03-22 00:24:07 +00:00
|
|
|
|
nir_variable_mode mode = var_data->mode;
|
|
|
|
|
vtn_get_builtin_location(b, builtin, &var_data->location, &mode);
|
|
|
|
|
var_data->mode = mode;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-01-10 05:48:55 +00:00
|
|
|
|
switch (builtin) {
|
|
|
|
|
case SpvBuiltInTessLevelOuter:
|
|
|
|
|
case SpvBuiltInTessLevelInner:
|
2019-01-23 09:55:45 +00:00
|
|
|
|
case SpvBuiltInClipDistance:
|
|
|
|
|
case SpvBuiltInCullDistance:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->compact = true;
|
2017-01-10 05:48:55 +00:00
|
|
|
|
break;
|
2017-01-11 23:16:11 +00:00
|
|
|
|
default:
|
|
|
|
|
break;
|
2017-01-10 05:48:55 +00:00
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
2016-05-24 21:59:10 +01:00
|
|
|
|
|
|
|
|
|
case SpvDecorationSpecId:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvDecorationRowMajor:
|
|
|
|
|
case SpvDecorationColMajor:
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationMatrixStride:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvDecorationAliased:
|
|
|
|
|
case SpvDecorationUniform:
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationLinkageAttributes:
|
|
|
|
|
break; /* Do nothing with these here */
|
|
|
|
|
|
|
|
|
|
case SpvDecorationPatch:
|
2018-03-22 00:24:07 +00:00
|
|
|
|
var_data->patch = true;
|
2016-06-02 22:34:15 +01:00
|
|
|
|
break;
|
2016-05-24 21:59:10 +01:00
|
|
|
|
|
2016-05-24 22:17:16 +01:00
|
|
|
|
case SpvDecorationLocation:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Handled above");
|
2016-05-24 22:17:16 +01:00
|
|
|
|
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationBlock:
|
|
|
|
|
case SpvDecorationBufferBlock:
|
|
|
|
|
case SpvDecorationArrayStride:
|
|
|
|
|
case SpvDecorationGLSLShared:
|
|
|
|
|
case SpvDecorationGLSLPacked:
|
2016-05-27 01:06:17 +01:00
|
|
|
|
break; /* These can apply to a type but we don't care about them */
|
|
|
|
|
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationBinding:
|
|
|
|
|
case SpvDecorationDescriptorSet:
|
|
|
|
|
case SpvDecorationNoContraction:
|
|
|
|
|
case SpvDecorationInputAttachmentIndex:
|
2016-06-02 22:34:15 +01:00
|
|
|
|
vtn_warn("Decoration not allowed for variable or structure member: %s",
|
|
|
|
|
spirv_decoration_to_string(dec->decoration));
|
|
|
|
|
break;
|
2016-05-24 21:59:10 +01:00
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvDecorationXfbBuffer:
|
2017-12-12 16:22:49 +00:00
|
|
|
|
var_data->explicit_xfb_buffer = true;
|
|
|
|
|
var_data->xfb_buffer = dec->literals[0];
|
2018-10-05 13:39:01 +01:00
|
|
|
|
var_data->always_active_io = true;
|
2017-12-12 16:22:49 +00:00
|
|
|
|
break;
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationXfbStride:
|
2017-12-12 16:22:49 +00:00
|
|
|
|
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];
|
2016-06-02 22:34:15 +01:00
|
|
|
|
break;
|
2016-05-24 21:59:10 +01:00
|
|
|
|
|
2018-01-17 15:35:56 +00:00
|
|
|
|
case SpvDecorationStream:
|
|
|
|
|
var_data->stream = dec->literals[0];
|
|
|
|
|
break;
|
|
|
|
|
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationCPacked:
|
|
|
|
|
case SpvDecorationSaturatedConversion:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvDecorationFuncParamAttr:
|
|
|
|
|
case SpvDecorationFPRoundingMode:
|
|
|
|
|
case SpvDecorationFPFastMathMode:
|
2016-05-24 21:59:10 +01:00
|
|
|
|
case SpvDecorationAlignment:
|
2018-02-26 23:01:02 +00:00
|
|
|
|
if (b->shader->info.stage != MESA_SHADER_KERNEL) {
|
|
|
|
|
vtn_warn("Decoration only allowed for CL-style kernels: %s",
|
|
|
|
|
spirv_decoration_to_string(dec->decoration));
|
|
|
|
|
}
|
2016-06-02 22:34:15 +01:00
|
|
|
|
break;
|
2017-01-25 14:03:31 +00:00
|
|
|
|
|
2018-10-13 14:41:36 +01:00
|
|
|
|
case SpvDecorationHlslSemanticGOOGLE:
|
|
|
|
|
/* HLSL semantic decorations can safely be ignored by the driver. */
|
|
|
|
|
break;
|
|
|
|
|
|
2019-01-19 16:23:28 +00:00
|
|
|
|
case SpvDecorationRestrictPointerEXT:
|
|
|
|
|
case SpvDecorationAliasedPointerEXT:
|
|
|
|
|
/* TODO: We should actually plumb alias information through NIR. */
|
|
|
|
|
break;
|
|
|
|
|
|
2017-01-25 14:03:31 +00:00
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Unhandled decoration");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-25 22:23:55 +01:00
|
|
|
|
static void
|
|
|
|
|
var_is_patch_cb(struct vtn_builder *b, struct vtn_value *val, int member,
|
|
|
|
|
const struct vtn_decoration *dec, void *out_is_patch)
|
|
|
|
|
{
|
|
|
|
|
if (dec->decoration == SpvDecorationPatch) {
|
|
|
|
|
*((bool *) out_is_patch) = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-07 02:33:14 +01:00
|
|
|
|
static void
|
|
|
|
|
var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
|
|
|
|
|
const struct vtn_decoration *dec, void *void_var)
|
|
|
|
|
{
|
|
|
|
|
struct vtn_variable *vtn_var = void_var;
|
|
|
|
|
|
|
|
|
|
/* Handle decorations that apply to a vtn_variable as a whole */
|
|
|
|
|
switch (dec->decoration) {
|
|
|
|
|
case SpvDecorationBinding:
|
|
|
|
|
vtn_var->binding = dec->literals[0];
|
2018-02-23 16:07:52 +00:00
|
|
|
|
vtn_var->explicit_binding = true;
|
2016-09-07 02:33:14 +01:00
|
|
|
|
return;
|
|
|
|
|
case SpvDecorationDescriptorSet:
|
|
|
|
|
vtn_var->descriptor_set = dec->literals[0];
|
|
|
|
|
return;
|
2016-11-14 22:22:56 +00:00
|
|
|
|
case SpvDecorationInputAttachmentIndex:
|
|
|
|
|
vtn_var->input_attachment_index = dec->literals[0];
|
|
|
|
|
return;
|
2016-09-25 22:23:55 +01:00
|
|
|
|
case SpvDecorationPatch:
|
|
|
|
|
vtn_var->patch = true;
|
|
|
|
|
break;
|
2017-11-05 11:00:19 +00:00
|
|
|
|
case SpvDecorationOffset:
|
|
|
|
|
vtn_var->offset = dec->literals[0];
|
|
|
|
|
break;
|
2018-10-10 09:42:19 +01:00
|
|
|
|
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;
|
2018-10-13 14:41:36 +01:00
|
|
|
|
case SpvDecorationHlslCounterBufferGOOGLE:
|
|
|
|
|
/* HLSL semantic decorations can safely be ignored by the driver. */
|
|
|
|
|
break;
|
2016-09-07 02:33:14 +01:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:27 +01:00
|
|
|
|
if (val->value_type == vtn_value_type_pointer) {
|
2017-12-12 17:44:59 +00:00
|
|
|
|
assert(val->pointer->var == void_var);
|
|
|
|
|
assert(member == -1);
|
2016-09-07 02:33:14 +01:00
|
|
|
|
} else {
|
2017-12-12 17:44:59 +00:00
|
|
|
|
assert(val->value_type == vtn_value_type_type);
|
2016-09-07 02:33:14 +01:00
|
|
|
|
}
|
|
|
|
|
|
2016-09-07 02:44:52 +01:00
|
|
|
|
/* Location is odd. If applied to a split structure, we have to walk the
|
|
|
|
|
* whole thing and accumulate the location. It's easier to handle as a
|
|
|
|
|
* special case.
|
2016-09-07 02:33:14 +01:00
|
|
|
|
*/
|
|
|
|
|
if (dec->decoration == SpvDecorationLocation) {
|
|
|
|
|
unsigned location = dec->literals[0];
|
2017-09-15 03:52:38 +01:00
|
|
|
|
if (b->shader->info.stage == MESA_SHADER_FRAGMENT &&
|
2016-09-07 02:33:14 +01:00
|
|
|
|
vtn_var->mode == vtn_variable_mode_output) {
|
|
|
|
|
location += FRAG_RESULT_DATA0;
|
2017-09-15 03:52:38 +01:00
|
|
|
|
} else if (b->shader->info.stage == MESA_SHADER_VERTEX &&
|
2016-09-07 02:33:14 +01:00
|
|
|
|
vtn_var->mode == vtn_variable_mode_input) {
|
|
|
|
|
location += VERT_ATTRIB_GENERIC0;
|
|
|
|
|
} else if (vtn_var->mode == vtn_variable_mode_input ||
|
|
|
|
|
vtn_var->mode == vtn_variable_mode_output) {
|
2016-09-25 22:23:55 +01:00
|
|
|
|
location += vtn_var->patch ? VARYING_SLOT_PATCH0 : VARYING_SLOT_VAR0;
|
2018-03-01 16:51:58 +00:00
|
|
|
|
} else if (vtn_var->mode != vtn_variable_mode_uniform) {
|
2017-06-22 12:00:08 +01:00
|
|
|
|
vtn_warn("Location must be on input, output, uniform, sampler or "
|
|
|
|
|
"image variable");
|
2017-01-13 16:08:28 +00:00
|
|
|
|
return;
|
2016-09-07 02:33:14 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-22 00:30:22 +00:00
|
|
|
|
if (vtn_var->var->num_members == 0) {
|
2016-09-07 02:33:14 +01:00
|
|
|
|
/* This handles the member and lone variable cases */
|
2016-09-07 02:44:52 +01:00
|
|
|
|
vtn_var->var->data.location = location;
|
2016-09-07 02:33:14 +01:00
|
|
|
|
} else {
|
|
|
|
|
/* This handles the structure member case */
|
2018-03-22 00:30:22 +00:00
|
|
|
|
assert(vtn_var->var->members);
|
2018-07-27 15:05:05 +01:00
|
|
|
|
|
|
|
|
|
if (member == -1)
|
|
|
|
|
vtn_var->base_location = location;
|
|
|
|
|
else
|
|
|
|
|
vtn_var->var->members[member].location = location;
|
2016-09-07 02:33:14 +01:00
|
|
|
|
}
|
2018-07-27 15:05:05 +01:00
|
|
|
|
|
2016-09-07 02:33:14 +01:00
|
|
|
|
return;
|
2016-09-07 02:44:52 +01:00
|
|
|
|
} else {
|
|
|
|
|
if (vtn_var->var) {
|
2018-03-22 00:30:22 +00:00
|
|
|
|
if (vtn_var->var->num_members == 0) {
|
2019-01-16 17:52:03 +00:00
|
|
|
|
/* We call this function on types as well as variables and not all
|
|
|
|
|
* struct types get split so we can end up having stray member
|
|
|
|
|
* decorations; just ignore them.
|
|
|
|
|
*/
|
|
|
|
|
if (member == -1)
|
|
|
|
|
apply_var_decoration(b, &vtn_var->var->data, dec);
|
2018-03-22 00:30:22 +00:00
|
|
|
|
} else if (member >= 0) {
|
2017-12-12 17:44:59 +00:00
|
|
|
|
/* Member decorations must come from a type */
|
|
|
|
|
assert(val->value_type == vtn_value_type_type);
|
2018-03-22 00:30:22 +00:00
|
|
|
|
apply_var_decoration(b, &vtn_var->var->members[member], dec);
|
2016-09-07 02:44:52 +01:00
|
|
|
|
} else {
|
|
|
|
|
unsigned length =
|
|
|
|
|
glsl_get_length(glsl_without_array(vtn_var->type->type));
|
|
|
|
|
for (unsigned i = 0; i < length; i++)
|
2018-03-22 00:30:22 +00:00
|
|
|
|
apply_var_decoration(b, &vtn_var->var->members[i], dec);
|
2016-09-07 02:44:52 +01:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
/* A few variables, those with external storage, have no actual
|
|
|
|
|
* nir_variables associated with them. Fortunately, all decorations
|
|
|
|
|
* we care about for those variables are on the type only.
|
|
|
|
|
*/
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(vtn_var->mode == vtn_variable_mode_ubo ||
|
|
|
|
|
vtn_var->mode == vtn_variable_mode_ssbo ||
|
2017-12-11 23:31:22 +00:00
|
|
|
|
vtn_var->mode == vtn_variable_mode_push_constant ||
|
|
|
|
|
(vtn_var->mode == vtn_variable_mode_workgroup &&
|
|
|
|
|
b->options->lower_workgroup_access_to_offsets));
|
2016-09-07 02:44:52 +01:00
|
|
|
|
}
|
2016-09-07 02:33:14 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:25 +01:00
|
|
|
|
static enum vtn_variable_mode
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_storage_class_to_mode(struct vtn_builder *b,
|
|
|
|
|
SpvStorageClass class,
|
2017-06-29 18:33:25 +01:00
|
|
|
|
struct vtn_type *interface_type,
|
|
|
|
|
nir_variable_mode *nir_mode_out)
|
|
|
|
|
{
|
|
|
|
|
enum vtn_variable_mode mode;
|
|
|
|
|
nir_variable_mode nir_mode;
|
|
|
|
|
switch (class) {
|
|
|
|
|
case SpvStorageClassUniform:
|
|
|
|
|
if (interface_type->block) {
|
|
|
|
|
mode = vtn_variable_mode_ubo;
|
2019-01-15 23:09:27 +00:00
|
|
|
|
nir_mode = nir_var_mem_ubo;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
} else if (interface_type->buffer_block) {
|
|
|
|
|
mode = vtn_variable_mode_ssbo;
|
2019-01-15 23:11:23 +00:00
|
|
|
|
nir_mode = nir_var_mem_ssbo;
|
2017-06-29 18:33:26 +01:00
|
|
|
|
} else {
|
2017-06-22 12:00:08 +01:00
|
|
|
|
/* Default-block uniforms, coming from gl_spirv */
|
|
|
|
|
mode = vtn_variable_mode_uniform;
|
|
|
|
|
nir_mode = nir_var_uniform;
|
2017-06-29 18:33:26 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
2017-05-16 16:34:50 +01:00
|
|
|
|
case SpvStorageClassStorageBuffer:
|
|
|
|
|
mode = vtn_variable_mode_ssbo;
|
2019-01-15 23:11:23 +00:00
|
|
|
|
nir_mode = nir_var_mem_ssbo;
|
2017-05-16 16:34:50 +01:00
|
|
|
|
break;
|
2019-01-19 16:23:28 +00:00
|
|
|
|
case SpvStorageClassPhysicalStorageBufferEXT:
|
|
|
|
|
mode = vtn_variable_mode_phys_ssbo;
|
|
|
|
|
nir_mode = nir_var_mem_global;
|
|
|
|
|
break;
|
2017-06-29 18:33:26 +01:00
|
|
|
|
case SpvStorageClassUniformConstant:
|
2018-03-01 16:51:58 +00:00
|
|
|
|
mode = vtn_variable_mode_uniform;
|
2017-06-22 12:00:08 +01:00
|
|
|
|
nir_mode = nir_var_uniform;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
break;
|
|
|
|
|
case SpvStorageClassPushConstant:
|
|
|
|
|
mode = vtn_variable_mode_push_constant;
|
|
|
|
|
nir_mode = nir_var_uniform;
|
|
|
|
|
break;
|
|
|
|
|
case SpvStorageClassInput:
|
|
|
|
|
mode = vtn_variable_mode_input;
|
|
|
|
|
nir_mode = nir_var_shader_in;
|
|
|
|
|
break;
|
|
|
|
|
case SpvStorageClassOutput:
|
|
|
|
|
mode = vtn_variable_mode_output;
|
|
|
|
|
nir_mode = nir_var_shader_out;
|
|
|
|
|
break;
|
|
|
|
|
case SpvStorageClassPrivate:
|
2018-10-23 22:26:22 +01:00
|
|
|
|
mode = vtn_variable_mode_private;
|
2019-01-15 22:56:29 +00:00
|
|
|
|
nir_mode = nir_var_shader_temp;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
break;
|
|
|
|
|
case SpvStorageClassFunction:
|
2018-10-23 22:26:22 +01:00
|
|
|
|
mode = vtn_variable_mode_function;
|
2019-01-15 23:05:04 +00:00
|
|
|
|
nir_mode = nir_var_function_temp;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
break;
|
|
|
|
|
case SpvStorageClassWorkgroup:
|
|
|
|
|
mode = vtn_variable_mode_workgroup;
|
2019-01-15 23:12:38 +00:00
|
|
|
|
nir_mode = nir_var_mem_shared;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
break;
|
2017-10-27 11:40:35 +01:00
|
|
|
|
case SpvStorageClassAtomicCounter:
|
|
|
|
|
mode = vtn_variable_mode_uniform;
|
|
|
|
|
nir_mode = nir_var_uniform;
|
|
|
|
|
break;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
case SpvStorageClassCrossWorkgroup:
|
2018-10-23 13:06:16 +01:00
|
|
|
|
mode = vtn_variable_mode_cross_workgroup;
|
|
|
|
|
nir_mode = nir_var_mem_global;
|
|
|
|
|
break;
|
2017-06-29 18:33:25 +01:00
|
|
|
|
case SpvStorageClassGeneric:
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Unhandled variable storage class");
|
2017-06-29 18:33:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (nir_mode_out)
|
|
|
|
|
*nir_mode_out = nir_mode;
|
|
|
|
|
|
|
|
|
|
return mode;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-28 08:45:36 +01:00
|
|
|
|
nir_ssa_def *
|
|
|
|
|
vtn_pointer_to_ssa(struct vtn_builder *b, struct vtn_pointer *ptr)
|
|
|
|
|
{
|
2018-03-22 23:39:54 +00:00
|
|
|
|
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);
|
2017-06-28 08:45:36 +01:00
|
|
|
|
|
2018-03-22 23:39:54 +00:00
|
|
|
|
struct vtn_access_chain chain = {
|
|
|
|
|
.length = 0,
|
|
|
|
|
};
|
|
|
|
|
ptr = vtn_ssa_offset_pointer_dereference(b, ptr, &chain);
|
|
|
|
|
}
|
2017-10-19 00:33:32 +01:00
|
|
|
|
|
2018-03-22 23:39:54 +00:00
|
|
|
|
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;
|
|
|
|
|
}
|
2017-10-19 01:58:11 +01:00
|
|
|
|
} else {
|
2018-12-15 00:36:01 +00:00
|
|
|
|
if (vtn_pointer_is_external_block(b, ptr) &&
|
2019-01-19 16:23:28 +00:00
|
|
|
|
vtn_type_contains_block(b, ptr->type) &&
|
|
|
|
|
ptr->mode != vtn_variable_mode_phys_ssbo) {
|
2018-12-15 00:36:01 +00:00
|
|
|
|
/* In this case, we're looking for a block index and not an actual
|
|
|
|
|
* deref.
|
2019-01-19 16:23:28 +00:00
|
|
|
|
*
|
|
|
|
|
* For PhysicalStorageBufferEXT pointers, we don't have a block index
|
|
|
|
|
* at all because we get the pointer directly from the client. This
|
|
|
|
|
* assumes that there will never be a SSBO binding variable using the
|
|
|
|
|
* PhysicalStorageBufferEXT storage class. This assumption appears
|
|
|
|
|
* to be correct according to the Vulkan spec because the table,
|
|
|
|
|
* "Shader Resource and Storage Class Correspondence," the only the
|
|
|
|
|
* Uniform storage class with BufferBlock or the StorageBuffer
|
|
|
|
|
* storage class with Block can be used.
|
2018-12-15 00:36:01 +00:00
|
|
|
|
*/
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-12 16:58:33 +00:00
|
|
|
|
return ptr->block_index;
|
2018-12-15 00:36:01 +00:00
|
|
|
|
} else {
|
|
|
|
|
return &vtn_pointer_to_deref(b, ptr)->dest.ssa;
|
|
|
|
|
}
|
2017-10-19 01:58:11 +01:00
|
|
|
|
}
|
2017-06-28 08:45:36 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct vtn_pointer *
|
|
|
|
|
vtn_pointer_from_ssa(struct vtn_builder *b, nir_ssa_def *ssa,
|
|
|
|
|
struct vtn_type *ptr_type)
|
|
|
|
|
{
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(ptr_type->base_type == vtn_base_type_pointer);
|
2018-03-22 23:39:54 +00:00
|
|
|
|
|
|
|
|
|
struct vtn_type *interface_type = ptr_type->deref;
|
|
|
|
|
while (interface_type->base_type == vtn_base_type_array)
|
|
|
|
|
interface_type = interface_type->array_element;
|
2017-06-28 08:45:36 +01:00
|
|
|
|
|
|
|
|
|
struct vtn_pointer *ptr = rzalloc(b, struct vtn_pointer);
|
2018-03-22 23:39:54 +00:00
|
|
|
|
nir_variable_mode nir_mode;
|
2017-09-05 23:46:58 +01:00
|
|
|
|
ptr->mode = vtn_storage_class_to_mode(b, ptr_type->storage_class,
|
2018-03-22 23:39:54 +00:00
|
|
|
|
interface_type, &nir_mode);
|
2017-06-28 08:45:36 +01:00
|
|
|
|
ptr->type = ptr_type->deref;
|
|
|
|
|
ptr->ptr_type = ptr_type;
|
2017-10-19 01:58:11 +01:00
|
|
|
|
|
2019-01-11 21:02:39 +00:00
|
|
|
|
if (b->wa_glslang_179) {
|
|
|
|
|
/* To work around https://github.com/KhronosGroup/glslang/issues/179 we
|
|
|
|
|
* need to whack the mode because it creates a function parameter with
|
|
|
|
|
* the Function storage class even though it's a pointer to a sampler.
|
|
|
|
|
* If we don't do this, then NIR won't get rid of the deref_cast for us.
|
|
|
|
|
*/
|
|
|
|
|
if (ptr->mode == vtn_variable_mode_function &&
|
|
|
|
|
(ptr->type->base_type == vtn_base_type_sampler ||
|
|
|
|
|
ptr->type->base_type == vtn_base_type_sampled_image)) {
|
|
|
|
|
ptr->mode = vtn_variable_mode_uniform;
|
|
|
|
|
nir_mode = nir_var_uniform;
|
|
|
|
|
}
|
2019-01-11 20:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-12-15 00:25:38 +00:00
|
|
|
|
if (vtn_pointer_uses_ssa_offset(b, ptr)) {
|
2018-03-22 23:39:54 +00:00
|
|
|
|
/* This pointer type needs to have actual storage */
|
|
|
|
|
vtn_assert(ptr_type->type);
|
2018-12-15 00:25:38 +00:00
|
|
|
|
if (ptr->mode == vtn_variable_mode_ubo ||
|
2018-12-15 00:36:01 +00:00
|
|
|
|
ptr->mode == vtn_variable_mode_ssbo) {
|
2018-12-15 00:25:38 +00:00
|
|
|
|
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;
|
|
|
|
|
}
|
2018-03-22 23:39:54 +00:00
|
|
|
|
} else {
|
2018-12-12 22:07:07 +00:00
|
|
|
|
const struct glsl_type *deref_type = ptr_type->deref->type;
|
2018-12-15 00:36:01 +00:00
|
|
|
|
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);
|
2019-01-19 16:23:28 +00:00
|
|
|
|
} else if (vtn_type_contains_block(b, ptr->type) &&
|
|
|
|
|
ptr->mode != vtn_variable_mode_phys_ssbo) {
|
2018-12-15 00:36:01 +00:00
|
|
|
|
/* This is a pointer to somewhere in an array of blocks, not a
|
2019-01-12 16:58:33 +00:00
|
|
|
|
* pointer to somewhere inside the block. Set the block index
|
|
|
|
|
* instead of making a cast.
|
2018-12-15 00:36:01 +00:00
|
|
|
|
*/
|
2019-01-12 16:58:33 +00:00
|
|
|
|
ptr->block_index = ssa;
|
2018-12-15 00:36:01 +00:00
|
|
|
|
} else {
|
|
|
|
|
/* This is a pointer to something internal or a pointer inside a
|
|
|
|
|
* block. It's just a regular cast.
|
2019-01-19 16:23:28 +00:00
|
|
|
|
*
|
|
|
|
|
* For PhysicalStorageBufferEXT pointers, we don't have a block index
|
|
|
|
|
* at all because we get the pointer directly from the client. This
|
|
|
|
|
* assumes that there will never be a SSBO binding variable using the
|
|
|
|
|
* PhysicalStorageBufferEXT storage class. This assumption appears
|
|
|
|
|
* to be correct according to the Vulkan spec because the table,
|
|
|
|
|
* "Shader Resource and Storage Class Correspondence," the only the
|
|
|
|
|
* Uniform storage class with BufferBlock or the StorageBuffer
|
|
|
|
|
* storage class with Block can be used.
|
2018-12-15 00:36:01 +00:00
|
|
|
|
*/
|
|
|
|
|
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);
|
|
|
|
|
}
|
2017-10-19 01:58:11 +01:00
|
|
|
|
}
|
2017-06-28 08:45:36 +01:00
|
|
|
|
|
|
|
|
|
return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-25 22:23:55 +01:00
|
|
|
|
static bool
|
|
|
|
|
is_per_vertex_inout(const struct vtn_variable *var, gl_shader_stage stage)
|
|
|
|
|
{
|
|
|
|
|
if (var->patch || !glsl_type_is_array(var->type->type))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (var->mode == vtn_variable_mode_input) {
|
|
|
|
|
return stage == MESA_SHADER_TESS_CTRL ||
|
|
|
|
|
stage == MESA_SHADER_TESS_EVAL ||
|
|
|
|
|
stage == MESA_SHADER_GEOMETRY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (var->mode == vtn_variable_mode_output)
|
|
|
|
|
return stage == MESA_SHADER_TESS_CTRL;
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-27 15:05:05 +01:00
|
|
|
|
static void
|
2019-01-24 13:52:37 +00:00
|
|
|
|
assign_missing_member_locations(struct vtn_variable *var)
|
2018-07-27 15:05:05 +01:00
|
|
|
|
{
|
|
|
|
|
unsigned length =
|
|
|
|
|
glsl_get_length(glsl_without_array(var->type->type));
|
|
|
|
|
int location = var->base_location;
|
|
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < length; i++) {
|
|
|
|
|
/* From the Vulkan spec:
|
|
|
|
|
*
|
|
|
|
|
* “If the structure type is a Block but without a Location, then each
|
|
|
|
|
* of its members must have a Location decoration.”
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
if (var->type->block) {
|
|
|
|
|
assert(var->base_location != -1 ||
|
|
|
|
|
var->var->members[i].location != -1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* From the Vulkan spec:
|
|
|
|
|
*
|
|
|
|
|
* “Any member with its own Location decoration is assigned that
|
|
|
|
|
* location. Each remaining member is assigned the location after the
|
|
|
|
|
* immediately preceding member in declaration order.”
|
|
|
|
|
*/
|
|
|
|
|
if (var->var->members[i].location != -1)
|
|
|
|
|
location = var->var->members[i].location;
|
|
|
|
|
else
|
|
|
|
|
var->var->members[i].location = location;
|
|
|
|
|
|
|
|
|
|
/* Below we use type instead of interface_type, because interface_type
|
|
|
|
|
* is only available when it is a Block. This code also supports
|
|
|
|
|
* input/outputs that are just structs
|
|
|
|
|
*/
|
|
|
|
|
const struct glsl_type *member_type =
|
|
|
|
|
glsl_get_struct_field(glsl_without_array(var->type->type), i);
|
|
|
|
|
|
|
|
|
|
location +=
|
2019-01-24 13:52:37 +00:00
|
|
|
|
glsl_count_attribute_slots(member_type,
|
|
|
|
|
false /* is_gl_vertex_input */);
|
2018-07-27 15:05:05 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
static void
|
|
|
|
|
vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
|
2017-06-29 18:33:39 +01:00
|
|
|
|
struct vtn_type *ptr_type, SpvStorageClass storage_class,
|
2017-06-29 18:33:32 +01:00
|
|
|
|
nir_constant *initializer)
|
2016-01-21 01:40:49 +00:00
|
|
|
|
{
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(ptr_type->base_type == vtn_base_type_pointer);
|
2017-06-29 18:33:39 +01:00
|
|
|
|
struct vtn_type *type = ptr_type->deref;
|
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
struct vtn_type *without_array = type;
|
|
|
|
|
while(glsl_type_is_array(without_array->type))
|
|
|
|
|
without_array = without_array->array_element;
|
2017-01-26 16:57:25 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
enum vtn_variable_mode mode;
|
|
|
|
|
nir_variable_mode nir_mode;
|
2017-09-05 23:46:58 +01:00
|
|
|
|
mode = vtn_storage_class_to_mode(b, storage_class, without_array, &nir_mode);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
switch (mode) {
|
|
|
|
|
case vtn_variable_mode_ubo:
|
2018-12-15 14:31:51 +00:00
|
|
|
|
/* There's no other way to get vtn_variable_mode_ubo */
|
|
|
|
|
vtn_assert(without_array->block);
|
2017-06-29 18:33:32 +01:00
|
|
|
|
b->shader->info.num_ubos++;
|
|
|
|
|
break;
|
|
|
|
|
case vtn_variable_mode_ssbo:
|
2018-12-15 14:31:51 +00:00
|
|
|
|
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");
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-06-29 18:33:32 +01:00
|
|
|
|
b->shader->info.num_ssbos++;
|
|
|
|
|
break;
|
2018-03-01 16:51:58 +00:00
|
|
|
|
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++;
|
2017-06-29 18:33:32 +01:00
|
|
|
|
break;
|
|
|
|
|
case vtn_variable_mode_push_constant:
|
2017-08-17 01:38:13 +01:00
|
|
|
|
b->shader->num_uniforms = vtn_type_block_size(b, type);
|
2017-06-29 18:33:32 +01:00
|
|
|
|
break;
|
2019-01-19 16:23:28 +00:00
|
|
|
|
|
|
|
|
|
case vtn_variable_mode_phys_ssbo:
|
|
|
|
|
vtn_fail("Cannot create a variable with the "
|
|
|
|
|
"PhysicalStorageBufferEXT storage class");
|
|
|
|
|
break;
|
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
default:
|
|
|
|
|
/* No tallying is needed */
|
|
|
|
|
break;
|
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
struct vtn_variable *var = rzalloc(b, struct vtn_variable);
|
|
|
|
|
var->type = type;
|
|
|
|
|
var->mode = mode;
|
2018-07-27 15:05:05 +01:00
|
|
|
|
var->base_location = -1;
|
2017-06-29 18:33:32 +01:00
|
|
|
|
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(val->value_type == vtn_value_type_pointer);
|
2017-06-29 18:33:39 +01:00
|
|
|
|
val->pointer = vtn_pointer_for_variable(b, var, ptr_type);
|
2017-06-29 18:33:32 +01:00
|
|
|
|
|
|
|
|
|
switch (var->mode) {
|
2018-10-23 22:26:22 +01:00
|
|
|
|
case vtn_variable_mode_function:
|
|
|
|
|
case vtn_variable_mode_private:
|
2017-06-22 12:00:08 +01:00
|
|
|
|
case vtn_variable_mode_uniform:
|
2017-06-29 18:33:32 +01:00
|
|
|
|
/* For these, we create the variable normally */
|
|
|
|
|
var->var = rzalloc(b->shader, nir_variable);
|
|
|
|
|
var->var->name = ralloc_strdup(var->var, val->name);
|
2017-11-10 15:57:40 +00:00
|
|
|
|
|
2018-05-02 21:28:43 +01:00
|
|
|
|
if (storage_class == SpvStorageClassAtomicCounter) {
|
2018-12-12 22:07:07 +00:00
|
|
|
|
/* 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.
|
|
|
|
|
*/
|
2018-05-02 21:28:43 +01:00
|
|
|
|
var->var->type = repair_atomic_type(var->type->type);
|
2017-11-10 15:57:40 +00:00
|
|
|
|
} else {
|
2018-12-12 22:07:07 +00:00
|
|
|
|
/* 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);
|
2017-11-10 15:57:40 +00:00
|
|
|
|
}
|
2017-06-29 18:33:32 +01:00
|
|
|
|
var->var->data.mode = nir_mode;
|
2017-06-22 12:00:08 +01:00
|
|
|
|
var->var->data.location = -1;
|
2018-03-01 16:51:58 +00:00
|
|
|
|
var->var->interface_type = NULL;
|
2017-06-29 18:33:32 +01:00
|
|
|
|
break;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-10-19 01:59:47 +01:00
|
|
|
|
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);
|
2018-12-12 22:07:07 +00:00
|
|
|
|
/* 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);
|
2019-01-15 23:12:38 +00:00
|
|
|
|
var->var->data.mode = nir_var_mem_shared;
|
2017-10-19 01:59:47 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
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
|
|
|
|
|
* the patch qualifier. This means walking the variable decorations
|
|
|
|
|
* early before we actually create any variables. Not a big deal.
|
|
|
|
|
*
|
|
|
|
|
* GLSLang really likes to place decorations in the most interior
|
|
|
|
|
* thing it possibly can. In particular, if you have a struct, it
|
|
|
|
|
* will place the patch decorations on the struct members. This
|
|
|
|
|
* should be handled by the variable splitting below just fine.
|
|
|
|
|
*
|
|
|
|
|
* If you have an array-of-struct, things get even more weird as it
|
|
|
|
|
* will place the patch decorations on the struct even though it's
|
|
|
|
|
* inside an array and some of the members being patch and others not
|
|
|
|
|
* makes no sense whatsoever. Since the only sensible thing is for
|
|
|
|
|
* it to be all or nothing, we'll call it patch if any of the members
|
|
|
|
|
* are declared patch.
|
|
|
|
|
*/
|
|
|
|
|
var->patch = false;
|
|
|
|
|
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)) {
|
2018-01-03 16:41:42 +00:00
|
|
|
|
vtn_foreach_decoration(b, vtn_value(b, without_array->id,
|
|
|
|
|
vtn_value_type_type),
|
2017-06-29 18:33:32 +01:00
|
|
|
|
var_is_patch_cb, &var->patch);
|
|
|
|
|
}
|
2017-06-29 18:33:28 +01:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
/* For inputs and outputs, we immediately split structures. This
|
|
|
|
|
* is for a couple of reasons. For one, builtins may all come in
|
|
|
|
|
* a struct and we really want those split out into separate
|
|
|
|
|
* variables. For another, interpolation qualifiers can be
|
|
|
|
|
* applied to members of the top-level struct ane we need to be
|
|
|
|
|
* able to preserve that information.
|
|
|
|
|
*/
|
2017-06-29 18:33:28 +01:00
|
|
|
|
|
2019-01-21 22:09:56 +00:00
|
|
|
|
struct vtn_type *per_vertex_type = var->type;
|
2017-09-15 03:52:38 +01:00
|
|
|
|
if (is_per_vertex_inout(var, b->shader->info.stage)) {
|
2017-06-29 18:33:32 +01:00
|
|
|
|
/* 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
|
|
|
|
|
* any case, there are no non-builtin arrays allowed so this
|
|
|
|
|
* check should be sufficient.
|
|
|
|
|
*/
|
2019-01-21 22:09:56 +00:00
|
|
|
|
per_vertex_type = var->type->array_element;
|
2017-06-29 18:33:32 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-22 00:30:22 +00:00
|
|
|
|
var->var = rzalloc(b->shader, nir_variable);
|
|
|
|
|
var->var->name = ralloc_strdup(var->var, val->name);
|
2018-12-12 22:07:07 +00:00
|
|
|
|
/* In Vulkan, shader I/O variables don't have any explicit layout but
|
|
|
|
|
* some layouts may have leaked through due to type deduplication in
|
2019-01-21 22:09:56 +00:00
|
|
|
|
* the SPIR-V. We do, however, keep the layouts in the variable's
|
|
|
|
|
* interface_type because we need offsets for XFB arrays of blocks.
|
2018-12-12 22:07:07 +00:00
|
|
|
|
*/
|
|
|
|
|
var->var->type = glsl_get_bare_type(var->type->type);
|
2018-03-22 00:30:22 +00:00
|
|
|
|
var->var->data.mode = nir_mode;
|
|
|
|
|
var->var->data.patch = var->patch;
|
|
|
|
|
|
2019-01-21 22:09:56 +00:00
|
|
|
|
/* Figure out the interface block type. */
|
|
|
|
|
struct vtn_type *iface_type = per_vertex_type;
|
|
|
|
|
if (var->mode == vtn_variable_mode_output &&
|
|
|
|
|
(b->shader->info.stage == MESA_SHADER_VERTEX ||
|
|
|
|
|
b->shader->info.stage == MESA_SHADER_TESS_EVAL ||
|
|
|
|
|
b->shader->info.stage == MESA_SHADER_GEOMETRY)) {
|
|
|
|
|
/* For vertex data outputs, we can end up with arrays of blocks for
|
|
|
|
|
* transform feedback where each array element corresponds to a
|
|
|
|
|
* different XFB output buffer.
|
|
|
|
|
*/
|
|
|
|
|
while (iface_type->base_type == vtn_base_type_array)
|
|
|
|
|
iface_type = iface_type->array_element;
|
|
|
|
|
}
|
|
|
|
|
if (iface_type->base_type == vtn_base_type_struct && iface_type->block)
|
|
|
|
|
var->var->interface_type = iface_type->type;
|
|
|
|
|
|
|
|
|
|
if (per_vertex_type->base_type == vtn_base_type_struct &&
|
|
|
|
|
per_vertex_type->block) {
|
2018-03-22 00:30:22 +00:00
|
|
|
|
/* It's a struct. Set it up as per-member. */
|
2019-01-21 22:09:56 +00:00
|
|
|
|
var->var->num_members = glsl_get_length(per_vertex_type->type);
|
2018-03-22 00:30:22 +00:00
|
|
|
|
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;
|
2018-07-27 15:05:05 +01:00
|
|
|
|
var->var->members[i].location = -1;
|
2017-06-29 18:33:32 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2016-01-21 10:09:38 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
/* For inputs and outputs, we need to grab locations and builtin
|
2019-01-21 22:09:56 +00:00
|
|
|
|
* information from the per-vertex type.
|
2017-06-29 18:33:32 +01:00
|
|
|
|
*/
|
2019-01-21 22:09:56 +00:00
|
|
|
|
vtn_foreach_decoration(b, vtn_value(b, per_vertex_type->id,
|
2018-01-03 16:41:42 +00:00
|
|
|
|
vtn_value_type_type),
|
|
|
|
|
var_decoration_cb, var);
|
2017-06-29 18:33:32 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
2016-01-21 10:09:38 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
case vtn_variable_mode_ubo:
|
|
|
|
|
case vtn_variable_mode_ssbo:
|
|
|
|
|
case vtn_variable_mode_push_constant:
|
2018-10-23 13:06:16 +01:00
|
|
|
|
case vtn_variable_mode_cross_workgroup:
|
2017-06-29 18:33:32 +01:00
|
|
|
|
/* These don't need actual variables. */
|
|
|
|
|
break;
|
2019-01-19 16:23:28 +00:00
|
|
|
|
|
|
|
|
|
case vtn_variable_mode_phys_ssbo:
|
|
|
|
|
unreachable("Should have been caught before");
|
2017-06-29 18:33:32 +01:00
|
|
|
|
}
|
2016-01-21 10:09:38 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
if (initializer) {
|
|
|
|
|
var->var->constant_initializer =
|
|
|
|
|
nir_constant_clone(initializer, var->var);
|
|
|
|
|
}
|
2016-01-21 10:09:38 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
vtn_foreach_decoration(b, val, var_decoration_cb, var);
|
2016-01-21 20:41:45 +00:00
|
|
|
|
|
2018-07-27 15:05:05 +01:00
|
|
|
|
if ((var->mode == vtn_variable_mode_input ||
|
|
|
|
|
var->mode == vtn_variable_mode_output) &&
|
|
|
|
|
var->var->members) {
|
2019-01-24 13:52:37 +00:00
|
|
|
|
assign_missing_member_locations(var);
|
2018-07-27 15:05:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-01 16:51:58 +00:00
|
|
|
|
if (var->mode == vtn_variable_mode_uniform) {
|
2017-06-29 18:33:32 +01:00
|
|
|
|
/* XXX: We still need the binding information in the nir_variable
|
|
|
|
|
* for these. We should fix that.
|
|
|
|
|
*/
|
|
|
|
|
var->var->data.binding = var->binding;
|
2018-02-23 16:07:52 +00:00
|
|
|
|
var->var->data.explicit_binding = var->explicit_binding;
|
2017-06-29 18:33:32 +01:00
|
|
|
|
var->var->data.descriptor_set = var->descriptor_set;
|
|
|
|
|
var->var->data.index = var->input_attachment_index;
|
2017-11-05 15:19:43 +00:00
|
|
|
|
var->var->data.offset = var->offset;
|
2016-01-21 20:41:45 +00:00
|
|
|
|
|
2018-03-01 16:51:58 +00:00
|
|
|
|
if (glsl_type_is_image(without_array->type))
|
2017-06-29 18:33:32 +01:00
|
|
|
|
var->var->data.image.format = without_array->image_format;
|
|
|
|
|
}
|
2016-01-21 10:09:38 +00:00
|
|
|
|
|
2018-10-23 22:26:22 +01:00
|
|
|
|
if (var->mode == vtn_variable_mode_function) {
|
2018-03-22 00:30:22 +00:00
|
|
|
|
vtn_assert(var->var != NULL && var->var->members == NULL);
|
2017-10-19 17:56:22 +01:00
|
|
|
|
nir_function_impl_add_variable(b->nb.impl, var->var);
|
2017-06-29 18:33:32 +01:00
|
|
|
|
} else if (var->var) {
|
|
|
|
|
nir_shader_add_variable(b->shader, var->var);
|
|
|
|
|
} else {
|
2017-10-19 01:38:57 +01:00
|
|
|
|
vtn_assert(vtn_pointer_is_external_block(b, val->pointer));
|
2017-06-29 18:33:32 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2016-01-21 10:09:38 +00:00
|
|
|
|
|
2018-01-02 04:00:02 +00:00
|
|
|
|
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));
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-22 00:20:46 +00:00
|
|
|
|
static nir_ssa_def *
|
|
|
|
|
nir_shrink_zero_pad_vec(nir_builder *b, nir_ssa_def *val,
|
|
|
|
|
unsigned num_components)
|
|
|
|
|
{
|
|
|
|
|
if (val->num_components == num_components)
|
|
|
|
|
return val;
|
|
|
|
|
|
|
|
|
|
nir_ssa_def *comps[NIR_MAX_VEC_COMPONENTS];
|
|
|
|
|
for (unsigned i = 0; i < num_components; i++) {
|
|
|
|
|
if (i < val->num_components)
|
|
|
|
|
comps[i] = nir_channel(b, val, i);
|
|
|
|
|
else
|
|
|
|
|
comps[i] = nir_imm_intN_t(b, 0, val->bit_size);
|
|
|
|
|
}
|
|
|
|
|
return nir_vec(b, comps, num_components);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static nir_ssa_def *
|
|
|
|
|
nir_sloppy_bitcast(nir_builder *b, nir_ssa_def *val,
|
|
|
|
|
const struct glsl_type *type)
|
|
|
|
|
{
|
|
|
|
|
const unsigned num_components = glsl_get_vector_elements(type);
|
|
|
|
|
const unsigned bit_size = glsl_get_bit_size(type);
|
|
|
|
|
|
|
|
|
|
/* First, zero-pad to ensure that the value is big enough that when we
|
|
|
|
|
* bit-cast it, we don't loose anything.
|
|
|
|
|
*/
|
|
|
|
|
if (val->bit_size < bit_size) {
|
|
|
|
|
const unsigned src_num_components_needed =
|
|
|
|
|
vtn_align_u32(val->num_components, bit_size / val->bit_size);
|
|
|
|
|
val = nir_shrink_zero_pad_vec(b, val, src_num_components_needed);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val = nir_bitcast_vector(b, val, bit_size);
|
|
|
|
|
|
|
|
|
|
return nir_shrink_zero_pad_vec(b, val, num_components);
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
void
|
|
|
|
|
vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
|
|
|
|
|
const uint32_t *w, unsigned count)
|
|
|
|
|
{
|
|
|
|
|
switch (opcode) {
|
|
|
|
|
case SpvOpUndef: {
|
|
|
|
|
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_undef);
|
|
|
|
|
val->type = vtn_value(b, w[1], vtn_value_type_type)->type;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
case SpvOpVariable: {
|
2017-06-29 18:33:39 +01:00
|
|
|
|
struct vtn_type *ptr_type = vtn_value(b, w[1], vtn_value_type_type)->type;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_pointer);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:32 +01:00
|
|
|
|
SpvStorageClass storage_class = w[3];
|
|
|
|
|
nir_constant *initializer = NULL;
|
|
|
|
|
if (count > 4)
|
|
|
|
|
initializer = vtn_value(b, w[4], vtn_value_type_constant)->constant;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:39 +01:00
|
|
|
|
vtn_create_variable(b, val, ptr_type, storage_class, initializer);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SpvOpAccessChain:
|
2017-06-29 00:31:06 +01:00
|
|
|
|
case SpvOpPtrAccessChain:
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvOpInBoundsAccessChain: {
|
2017-06-29 18:33:33 +01:00
|
|
|
|
struct vtn_access_chain *chain = vtn_access_chain_create(b, count - 4);
|
2017-06-29 00:31:06 +01:00
|
|
|
|
chain->ptr_as_array = (opcode == SpvOpPtrAccessChain);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:33 +01:00
|
|
|
|
unsigned idx = 0;
|
2016-01-21 18:20:50 +00:00
|
|
|
|
for (int i = 4; i < count; i++) {
|
|
|
|
|
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;
|
2018-12-14 17:06:07 +00:00
|
|
|
|
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");
|
|
|
|
|
}
|
2016-01-21 18:20:50 +00:00
|
|
|
|
} else {
|
|
|
|
|
chain->link[idx].mode = vtn_access_mode_id;
|
|
|
|
|
chain->link[idx].id = w[i];
|
2017-06-29 18:33:28 +01:00
|
|
|
|
|
|
|
|
|
}
|
2016-01-21 18:20:50 +00:00
|
|
|
|
idx++;
|
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-06-29 18:33:39 +01:00
|
|
|
|
struct vtn_type *ptr_type = vtn_value(b, w[1], vtn_value_type_type)->type;
|
2017-06-29 18:33:33 +01:00
|
|
|
|
struct vtn_value *base_val = vtn_untyped_value(b, w[3]);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
if (base_val->value_type == vtn_value_type_sampled_image) {
|
2017-06-29 18:33:33 +01:00
|
|
|
|
/* This is rather insane. SPIR-V allows you to use OpSampledImage
|
|
|
|
|
* to combine an array of images with a single sampler to get an
|
|
|
|
|
* array of sampled images that all share the same sampler.
|
|
|
|
|
* Fortunately, this means that we can more-or-less ignore the
|
|
|
|
|
* sampler when crawling the access chain, but it does leave us
|
|
|
|
|
* with this rather awkward little special-case.
|
|
|
|
|
*/
|
2016-01-21 01:40:49 +00:00
|
|
|
|
struct vtn_value *val =
|
|
|
|
|
vtn_push_value(b, w[2], vtn_value_type_sampled_image);
|
|
|
|
|
val->sampled_image = ralloc(b, struct vtn_sampled_image);
|
2017-11-06 10:37:05 +00:00
|
|
|
|
val->sampled_image->type = base_val->sampled_image->type;
|
2017-06-29 18:33:33 +01:00
|
|
|
|
val->sampled_image->image =
|
|
|
|
|
vtn_pointer_dereference(b, base_val->sampled_image->image, chain);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
val->sampled_image->sampler = base_val->sampled_image->sampler;
|
|
|
|
|
} else {
|
2017-08-17 01:38:13 +01:00
|
|
|
|
vtn_assert(base_val->value_type == vtn_value_type_pointer);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
struct vtn_value *val =
|
2017-06-29 18:33:27 +01:00
|
|
|
|
vtn_push_value(b, w[2], vtn_value_type_pointer);
|
2017-06-29 18:33:33 +01:00
|
|
|
|
val->pointer = vtn_pointer_dereference(b, base_val->pointer, chain);
|
2017-06-29 18:33:39 +01:00
|
|
|
|
val->pointer->ptr_type = ptr_type;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SpvOpCopyMemory: {
|
2017-06-29 18:33:27 +01:00
|
|
|
|
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);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2018-01-02 04:00:02 +00:00
|
|
|
|
vtn_assert_types_equal(b, opcode, dest->type->deref, src->type->deref);
|
2017-12-06 06:51:53 +00:00
|
|
|
|
|
2017-06-29 18:33:27 +01:00
|
|
|
|
vtn_variable_copy(b, dest->pointer, src->pointer);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SpvOpLoad: {
|
2017-06-28 10:50:33 +01:00
|
|
|
|
struct vtn_type *res_type =
|
|
|
|
|
vtn_value(b, w[1], vtn_value_type_type)->type;
|
2017-12-06 06:51:53 +00:00
|
|
|
|
struct vtn_value *src_val = vtn_value(b, w[3], vtn_value_type_pointer);
|
|
|
|
|
struct vtn_pointer *src = src_val->pointer;
|
|
|
|
|
|
2018-01-02 04:00:02 +00:00
|
|
|
|
vtn_assert_types_equal(b, opcode, res_type, src_val->type->deref);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2018-03-01 16:51:58 +00:00
|
|
|
|
if (glsl_type_is_image(res_type->type) ||
|
|
|
|
|
glsl_type_is_sampler(res_type->type)) {
|
2017-06-29 18:33:27 +01:00
|
|
|
|
vtn_push_value(b, w[2], vtn_value_type_pointer)->pointer = src;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-28 10:50:33 +01:00
|
|
|
|
vtn_push_ssa(b, w[2], res_type, vtn_variable_load(b, src));
|
2016-01-21 01:40:49 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SpvOpStore: {
|
2017-12-06 06:51:53 +00:00
|
|
|
|
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]);
|
|
|
|
|
|
2018-01-03 17:05:31 +00:00
|
|
|
|
/* OpStore requires us to actually have a storage type */
|
|
|
|
|
vtn_fail_if(dest->type->type == NULL,
|
|
|
|
|
"Invalid destination type for OpStore");
|
|
|
|
|
|
2018-01-03 17:26:18 +00:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-02 04:00:02 +00:00
|
|
|
|
vtn_assert_types_equal(b, opcode, dest_val->type->deref, src_val->type);
|
2017-06-20 17:06:44 +01:00
|
|
|
|
|
2017-06-29 18:33:28 +01:00
|
|
|
|
if (glsl_type_is_sampler(dest->type->type)) {
|
2019-01-11 21:02:39 +00:00
|
|
|
|
if (b->wa_glslang_179) {
|
|
|
|
|
vtn_warn("OpStore of a sampler detected. Doing on-the-fly copy "
|
|
|
|
|
"propagation to workaround the problem.");
|
|
|
|
|
vtn_assert(dest->var->copy_prop_sampler == NULL);
|
|
|
|
|
dest->var->copy_prop_sampler =
|
|
|
|
|
vtn_value(b, w[2], vtn_value_type_pointer)->pointer;
|
|
|
|
|
} else {
|
|
|
|
|
vtn_fail("Vulkan does not allow OpStore of a sampler or image.");
|
|
|
|
|
}
|
2017-06-20 17:06:44 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
struct vtn_ssa_value *src = vtn_ssa_value(b, w[2]);
|
|
|
|
|
vtn_variable_store(b, src, dest);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SpvOpArrayLength: {
|
2017-06-29 18:33:28 +01:00
|
|
|
|
struct vtn_pointer *ptr =
|
2017-06-29 18:33:27 +01:00
|
|
|
|
vtn_value(b, w[3], vtn_value_type_pointer)->pointer;
|
2019-01-12 16:32:13 +00:00
|
|
|
|
const uint32_t field = w[4];
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2019-01-12 16:32:13 +00:00
|
|
|
|
vtn_fail_if(ptr->type->base_type != vtn_base_type_struct,
|
|
|
|
|
"OpArrayLength must take a pointer to a structure type");
|
|
|
|
|
vtn_fail_if(field != ptr->type->length - 1 ||
|
|
|
|
|
ptr->type->members[field]->base_type != vtn_base_type_array,
|
|
|
|
|
"OpArrayLength must reference the last memeber of the "
|
|
|
|
|
"structure and that must be an array");
|
|
|
|
|
|
|
|
|
|
const uint32_t offset = ptr->type->offsets[field];
|
|
|
|
|
const uint32_t stride = ptr->type->members[field]->stride;
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
2017-10-19 17:23:07 +01:00
|
|
|
|
if (!ptr->block_index) {
|
|
|
|
|
struct vtn_access_chain chain = {
|
|
|
|
|
.length = 0,
|
|
|
|
|
};
|
2019-01-12 16:57:28 +00:00
|
|
|
|
ptr = vtn_pointer_dereference(b, ptr, &chain);
|
2017-10-19 17:23:07 +01:00
|
|
|
|
vtn_assert(ptr->block_index);
|
|
|
|
|
}
|
2016-01-21 01:40:49 +00:00
|
|
|
|
|
|
|
|
|
nir_intrinsic_instr *instr =
|
|
|
|
|
nir_intrinsic_instr_create(b->nb.shader,
|
|
|
|
|
nir_intrinsic_get_buffer_size);
|
2017-10-19 17:23:07 +01:00
|
|
|
|
instr->src[0] = nir_src_for_ssa(ptr->block_index);
|
2016-03-25 00:30:14 +00:00
|
|
|
|
nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL);
|
2016-01-21 01:40:49 +00:00
|
|
|
|
nir_builder_instr_insert(&b->nb, &instr->instr);
|
|
|
|
|
nir_ssa_def *buf_size = &instr->dest.ssa;
|
|
|
|
|
|
|
|
|
|
/* array_length = max(buffer_size - offset, 0) / stride */
|
|
|
|
|
nir_ssa_def *array_length =
|
|
|
|
|
nir_idiv(&b->nb,
|
|
|
|
|
nir_imax(&b->nb,
|
|
|
|
|
nir_isub(&b->nb,
|
|
|
|
|
buf_size,
|
|
|
|
|
nir_imm_int(&b->nb, offset)),
|
|
|
|
|
nir_imm_int(&b->nb, 0u)),
|
|
|
|
|
nir_imm_int(&b->nb, stride));
|
|
|
|
|
|
|
|
|
|
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa);
|
|
|
|
|
val->ssa = vtn_create_ssa_value(b, glsl_uint_type());
|
|
|
|
|
val->ssa->def = array_length;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-22 00:20:46 +00:00
|
|
|
|
case SpvOpConvertPtrToU: {
|
|
|
|
|
struct vtn_value *u_val = vtn_push_value(b, w[2], vtn_value_type_ssa);
|
|
|
|
|
|
|
|
|
|
vtn_fail_if(u_val->type->base_type != vtn_base_type_vector &&
|
|
|
|
|
u_val->type->base_type != vtn_base_type_scalar,
|
|
|
|
|
"OpConvertPtrToU can only be used to cast to a vector or "
|
|
|
|
|
"scalar type");
|
|
|
|
|
|
|
|
|
|
/* The pointer will be converted to an SSA value automatically */
|
|
|
|
|
nir_ssa_def *ptr_ssa = vtn_ssa_value(b, w[3])->def;
|
|
|
|
|
|
|
|
|
|
u_val->ssa = vtn_create_ssa_value(b, u_val->type->type);
|
|
|
|
|
u_val->ssa->def = nir_sloppy_bitcast(&b->nb, ptr_ssa, u_val->type->type);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SpvOpConvertUToPtr: {
|
|
|
|
|
struct vtn_value *ptr_val =
|
|
|
|
|
vtn_push_value(b, w[2], vtn_value_type_pointer);
|
|
|
|
|
struct vtn_value *u_val = vtn_value(b, w[3], vtn_value_type_ssa);
|
|
|
|
|
|
|
|
|
|
vtn_fail_if(ptr_val->type->type == NULL,
|
|
|
|
|
"OpConvertUToPtr can only be used on physical pointers");
|
|
|
|
|
|
|
|
|
|
vtn_fail_if(u_val->type->base_type != vtn_base_type_vector &&
|
|
|
|
|
u_val->type->base_type != vtn_base_type_scalar,
|
|
|
|
|
"OpConvertUToPtr can only be used to cast from a vector or "
|
|
|
|
|
"scalar type");
|
|
|
|
|
|
|
|
|
|
nir_ssa_def *ptr_ssa = nir_sloppy_bitcast(&b->nb, u_val->ssa->def,
|
|
|
|
|
ptr_val->type->type);
|
|
|
|
|
ptr_val->pointer = vtn_pointer_from_ssa(b, ptr_ssa, ptr_val->type);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-21 01:40:49 +00:00
|
|
|
|
case SpvOpCopyMemorySized:
|
|
|
|
|
default:
|
2017-09-05 23:46:58 +01:00
|
|
|
|
vtn_fail("Unhandled opcode");
|
2016-01-21 01:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|