X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fspirv%2Fspirv_to_nir.c;h=27ca4fb5d11031b77f8b29b2bd832dce8666d67e;hb=c0cfc9f14567d56a5d64851cf1b5dcfc910a7fef;hp=d39f2a0d4f1ad8a8ae1d068fd4ee82bfb2e73457;hpb=abbfc5b8db7412fa2e6f8c1b66ff97b886c4ac70;p=mesa.git diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index d39f2a0d4f1..27ca4fb5d11 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -324,11 +324,12 @@ vtn_get_image(struct vtn_builder *b, uint32_t value_id) static void vtn_push_image(struct vtn_builder *b, uint32_t value_id, - nir_deref_instr *deref) + nir_deref_instr *deref, bool propagate_non_uniform) { struct vtn_type *type = vtn_get_value_type(b, value_id); vtn_assert(type->base_type == vtn_base_type_image); - vtn_push_nir_ssa(b, value_id, &deref->dest.ssa); + struct vtn_value *value = vtn_push_nir_ssa(b, value_id, &deref->dest.ssa); + value->propagated_non_uniform = propagate_non_uniform; } static nir_deref_instr * @@ -349,11 +350,13 @@ vtn_sampled_image_to_nir_ssa(struct vtn_builder *b, static void vtn_push_sampled_image(struct vtn_builder *b, uint32_t value_id, - struct vtn_sampled_image si) + struct vtn_sampled_image si, bool propagate_non_uniform) { struct vtn_type *type = vtn_get_value_type(b, value_id); vtn_assert(type->base_type == vtn_base_type_sampled_image); - vtn_push_nir_ssa(b, value_id, vtn_sampled_image_to_nir_ssa(b, si)); + struct vtn_value *value = vtn_push_nir_ssa(b, value_id, + vtn_sampled_image_to_nir_ssa(b, si)); + value->propagated_non_uniform = propagate_non_uniform; } static struct vtn_sampled_image @@ -1038,6 +1041,7 @@ struct_member_decoration_cb(struct vtn_builder *b, case SpvDecorationLinkageAttributes: case SpvDecorationNoContraction: case SpvDecorationInputAttachmentIndex: + case SpvDecorationCPacked: vtn_warn("Decoration not allowed on struct members: %s", spirv_decoration_to_string(dec->decoration)); break; @@ -1047,14 +1051,6 @@ struct_member_decoration_cb(struct vtn_builder *b, /* This is handled later by var_decoration_cb in vtn_variables.c */ break; - case SpvDecorationCPacked: - if (b->shader->info.stage != MESA_SHADER_KERNEL) - vtn_warn("Decoration only allowed for CL-style kernels: %s", - spirv_decoration_to_string(dec->decoration)); - else - ctx->type->packed = true; - break; - case SpvDecorationSaturatedConversion: case SpvDecorationFuncParamAttr: case SpvDecorationFPRoundingMode: @@ -1135,6 +1131,21 @@ struct_member_matrix_stride_cb(struct vtn_builder *b, ctx->fields[member].type = ctx->type->members[member]->type; } +static void +struct_packed_decoration_cb(struct vtn_builder *b, + struct vtn_value *val, int member, + const struct vtn_decoration *dec, void *void_ctx) +{ + vtn_assert(val->type->base_type == vtn_base_type_struct); + if (dec->decoration == SpvDecorationCPacked) { + if (b->shader->info.stage != MESA_SHADER_KERNEL) { + vtn_warn("Decoration only allowed for CL-style kernels: %s", + spirv_decoration_to_string(dec->decoration)); + } + val->type->packed = true; + } +} + static void struct_block_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, @@ -1233,11 +1244,7 @@ type_decoration_cb(struct vtn_builder *b, break; case SpvDecorationCPacked: - if (b->shader->info.stage != MESA_SHADER_KERNEL) - vtn_warn("Decoration only allowed for CL-style kernels: %s", - spirv_decoration_to_string(dec->decoration)); - else - type->packed = true; + /* Handled when parsing a struct type, nothing to do here. */ break; case SpvDecorationSaturatedConversion: @@ -1433,8 +1440,6 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode, val->type->base_type = vtn_base_type_array; val->type->array_element = array_element; - if (b->shader->info.stage == MESA_SHADER_KERNEL) - val->type->stride = glsl_get_cl_size(array_element->type); vtn_foreach_decoration(b, val, array_stride_decoration_cb, NULL); val->type->type = glsl_array_type(array_element->type, val->type->length, @@ -1461,14 +1466,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode, }; } - if (b->shader->info.stage == MESA_SHADER_KERNEL) { - unsigned offset = 0; - for (unsigned i = 0; i < num_fields; i++) { - offset = align(offset, glsl_get_cl_alignment(fields[i].type)); - fields[i].offset = offset; - offset += glsl_get_cl_size(fields[i].type); - } - } + vtn_foreach_decoration(b, val, struct_packed_decoration_cb, NULL); struct member_decoration_ctx ctx = { .num_fields = num_fields, @@ -1492,7 +1490,8 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode, name ? name : "block"); } else { val->type->type = glsl_struct_type(fields, num_fields, - name ? name : "struct", false); + name ? name : "struct", + val->type->packed); } break; } @@ -1564,20 +1563,6 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode, /* Nothing to do. */ break; } - - if (b->physical_ptrs) { - switch (storage_class) { - case SpvStorageClassFunction: - case SpvStorageClassWorkgroup: - case SpvStorageClassCrossWorkgroup: - case SpvStorageClassUniformConstant: - val->type->stride = align(glsl_get_cl_size(val->type->deref->type), - glsl_get_cl_alignment(val->type->deref->type)); - break; - default: - break; - } - } } break; } @@ -2490,11 +2475,23 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode, .image = vtn_get_image(b, w[3]), .sampler = vtn_get_sampler(b, w[4]), }; - vtn_push_sampled_image(b, w[2], si); + + enum gl_access_qualifier access = 0; + vtn_foreach_decoration(b, vtn_untyped_value(b, w[3]), + non_uniform_decoration_cb, &access); + vtn_foreach_decoration(b, vtn_untyped_value(b, w[4]), + non_uniform_decoration_cb, &access); + + vtn_push_sampled_image(b, w[2], si, access & ACCESS_NON_UNIFORM); return; } else if (opcode == SpvOpImage) { struct vtn_sampled_image si = vtn_get_sampled_image(b, w[3]); - vtn_push_image(b, w[2], si.image); + + enum gl_access_qualifier access = 0; + vtn_foreach_decoration(b, vtn_untyped_value(b, w[3]), + non_uniform_decoration_cb, &access); + + vtn_push_image(b, w[2], si.image, access & ACCESS_NON_UNIFORM); return; } @@ -2816,6 +2813,9 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode, enum gl_access_qualifier access = 0; vtn_foreach_decoration(b, sampled_val, non_uniform_decoration_cb, &access); + if (sampled_val->propagated_non_uniform) + access |= ACCESS_NON_UNIFORM; + if (image && (access & ACCESS_NON_UNIFORM)) instr->texture_non_uniform = true; @@ -5548,8 +5548,6 @@ vtn_emit_kernel_entry_point_wrapper(struct vtn_builder *b, const char *func_name = ralloc_asprintf(b->shader, "__wrapped_%s", entry_point->name); - /* we shouldn't have any inputs yet */ - vtn_assert(!entry_point->shader->num_inputs); vtn_assert(b->shader->info.stage == MESA_SHADER_KERNEL); nir_function *main_entry_point = nir_function_create(b->shader, func_name); @@ -5592,7 +5590,6 @@ vtn_emit_kernel_entry_point_wrapper(struct vtn_builder *b, in_var->type = param_type->type; nir_shader_add_variable(b->nb.shader, in_var); - b->nb.shader->num_inputs++; /* we have to copy the entire variable into function memory */ if (is_by_val) { @@ -5649,7 +5646,8 @@ spirv_to_nir(const uint32_t *words, size_t word_count, vtn_handle_preamble_instruction); if (b->entry_point == NULL) { - vtn_fail("Entry point not found"); + vtn_fail("Entry point not found for %s shader \"%s\"", + _mesa_shader_stage_to_string(stage), entry_point_name); ralloc_free(b); return NULL; }