From 4b21754073079f17056739a6fddaada03368170b Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Thu, 13 Jul 2017 14:33:57 +0000 Subject: [PATCH] anv/pipeline: use unsigned long long constant to check enable vertex inputs When initializing the ANV pipeline, one of the tasks is checking which vertex inputs are enabled. This is done by checking if the enabled bits in inputs_read. But the mask to use is computed doing `(1 << (VERT_ATTRIB_GENERIC0 + desc->location))`. The problem here is that if location is 15 or greater, the sum is 32 or greater. But C is handling 1 as a 32-bit integer, which means the displaced bit is out of range and thus the full value is 0. Thus, use 1ull, which is an unsigned long long value. This fixes: dEQP-VK.pipeline.vertex_input.max_attributes.16_attributes.binding_one_to_one.interleaved v2: use 1ull instead of BITFIELD64_BIT() (Matt Turner) Reviewed-by: Lionel Landwerlin Reviewed-by: Matt Turner Signed-off-by: Juan A. Suarez Romero Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit 28d0c38d85d94cab23667049f03ea072b8e7907c) --- src/intel/vulkan/anv_pipeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 9d0dc69fa84..bdc4e214bf6 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -1285,7 +1285,7 @@ anv_pipeline_init(struct anv_pipeline *pipeline, const VkVertexInputAttributeDescription *desc = &vi_info->pVertexAttributeDescriptions[i]; - if (inputs_read & (1 << (VERT_ATTRIB_GENERIC0 + desc->location))) + if (inputs_read & BITFIELD64_BIT(VERT_ATTRIB_GENERIC0 + desc->location)) pipeline->vb_used |= 1 << desc->binding; } -- 2.11.0