From fae8d325a7ad5ae060ca37d88266201cb7c81e2a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 12 Feb 2025 09:55:59 +0200 Subject: [PATCH] brw: update vulkan max attribute limit Signed-off-by: Lionel Landwerlin Reviewed-by: Caio Oliveira Part-of: --- src/intel/compiler/brw_compiler.h | 4 ++-- src/intel/compiler/elk/elk_compiler.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h index cd903b6f64e..395894a0369 100644 --- a/src/intel/compiler/brw_compiler.h +++ b/src/intel/compiler/brw_compiler.h @@ -223,11 +223,11 @@ struct brw_base_prog_key { /** * OpenGL attribute slots fall in [0, VERT_ATTRIB_MAX - 1] with the range * [VERT_ATTRIB_GENERIC0, VERT_ATTRIB_MAX - 1] reserved for up to 16 user - * input vertex attributes. In Vulkan, we expose up to 28 user vertex input + * input vertex attributes. In Vulkan, we expose up to 29 user vertex input * attributes that are mapped to slots also starting at VERT_ATTRIB_GENERIC0. */ #define MAX_GL_VERT_ATTRIB VERT_ATTRIB_MAX -#define MAX_VK_VERT_ATTRIB (VERT_ATTRIB_GENERIC0 + 28) +#define MAX_VK_VERT_ATTRIB (VERT_ATTRIB_GENERIC0 + 29) /** The program key for Vertex Shaders. */ struct brw_vs_prog_key { diff --git a/src/intel/compiler/elk/elk_compiler.h b/src/intel/compiler/elk/elk_compiler.h index c52d3377ca6..47f2c27734b 100644 --- a/src/intel/compiler/elk/elk_compiler.h +++ b/src/intel/compiler/elk/elk_compiler.h @@ -241,11 +241,11 @@ struct elk_base_prog_key { /** * OpenGL attribute slots fall in [0, VERT_ATTRIB_MAX - 1] with the range * [VERT_ATTRIB_GENERIC0, VERT_ATTRIB_MAX - 1] reserved for up to 16 user - * input vertex attributes. In Vulkan, we expose up to 28 user vertex input + * input vertex attributes. In Vulkan, we expose up to 29 user vertex input * attributes that are mapped to slots also starting at VERT_ATTRIB_GENERIC0. */ #define MAX_GL_VERT_ATTRIB VERT_ATTRIB_MAX -#define MAX_VK_VERT_ATTRIB (VERT_ATTRIB_GENERIC0 + 28) +#define MAX_VK_VERT_ATTRIB (VERT_ATTRIB_GENERIC0 + 29) /** * Max number of binding table entries used for stream output. @@ -314,7 +314,7 @@ struct elk_vs_prog_key { */ unsigned nr_userclip_plane_consts:4; - uint32_t padding: 25; + uint32_t padding: 17; }; /** The program key for Tessellation Control Shaders. */