From f038b3a136175c0afcc6545b886238a7b5dcf515 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 9 Aug 2020 00:51:15 +0200 Subject: [PATCH] radv: Fix handling of attribs 16-31. We really need to update the enum for consistency, but that involves a bunch of GL & bitfield work which is error-prone, so since this is a fix for stable lets do the simple things. Confirmed that nothing in radv/aco/nir/spirv uses MAX_VERT_ATTRIB except the one thing I bumped. CC: mesa-stable Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_shader.h | 4 +++- src/amd/vulkan/radv_shader_info.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 08d7fb9aff2..adf5620ef23 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -36,6 +36,8 @@ #include "vulkan/vulkan.h" #include "vulkan/util/vk_object.h" +#define RADV_VERT_ATTRIB_MAX MAX2(VERT_ATTRIB_MAX, VERT_ATTRIB_GENERIC0 + MAX_VERTEX_ATTRIBS) + struct radv_device; struct radv_shader_module { @@ -253,7 +255,7 @@ struct radv_shader_info { bool is_ngg_passthrough; struct { uint64_t ls_outputs_written; - uint8_t input_usage_mask[VERT_ATTRIB_MAX]; + uint8_t input_usage_mask[RADV_VERT_ATTRIB_MAX]; uint8_t output_usage_mask[VARYING_SLOT_VAR31 + 1]; bool has_vertex_buffers; /* needs vertex buffers and base/start */ bool needs_draw_id; diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c index 8f2b6a1f5b1..2c8d4e0511f 100644 --- a/src/amd/vulkan/radv_shader_info.c +++ b/src/amd/vulkan/radv_shader_info.c @@ -403,7 +403,7 @@ gather_info_input_decl_vs(const nir_shader *nir, const nir_variable *var, unsigned attrib_count = glsl_count_attribute_slots(var->type, true); int idx = var->data.location; - if (idx >= VERT_ATTRIB_GENERIC0 && idx <= VERT_ATTRIB_GENERIC15) + if (idx >= VERT_ATTRIB_GENERIC0 && idx < VERT_ATTRIB_GENERIC0 + MAX_VERTEX_ATTRIBS) info->vs.has_vertex_buffers = true; for (unsigned i = 0; i < attrib_count; ++i) {