From 98cf60a3ce27f6afccca3150583793c143eac646 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 29 Jan 2017 02:44:32 +0000 Subject: [PATCH] anv: limit vertex buffers to 31 Signed-off-by: Lionel Landwerlin Reviewed-by: Anuj Phogat Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_device.c | 4 ++-- src/intel/vulkan/anv_private.h | 2 +- src/intel/vulkan/genX_pipeline.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 27f06ac02c6..3403dc126aa 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -562,8 +562,8 @@ void anv_GetPhysicalDeviceProperties( .maxDescriptorSetSampledImages = 256, .maxDescriptorSetStorageImages = 256, .maxDescriptorSetInputAttachments = 256, - .maxVertexInputAttributes = 32, - .maxVertexInputBindings = 32, + .maxVertexInputAttributes = MAX_VBS, + .maxVertexInputBindings = MAX_VBS, .maxVertexInputAttributeOffset = 2047, .maxVertexInputBindingStride = 2048, .maxVertexOutputComponents = 128, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index a0cb35ccccb..1cf33b76c64 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -87,7 +87,7 @@ extern "C" { */ #define ANV_HZ_FC_VAL 1.0f -#define MAX_VBS 32 +#define MAX_VBS 31 #define MAX_SETS 8 #define MAX_RTS 8 #define MAX_VIEWPORTS 16 diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 9d28466f796..d3a9d4302e5 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -133,7 +133,7 @@ emit_vertex_input(struct anv_pipeline *pipeline, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_TILING_LINEAR); - assert(desc->binding < 32); + assert(desc->binding < MAX_VBS); if ((elements & (1 << desc->location)) == 0) continue; /* Binding unused */ -- 2.30.2