From 51285c6715fe18bc0f19f869d00d147c46ca34d3 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Fri, 31 Oct 2025 14:24:06 +0100 Subject: [PATCH] lavapipe: Bump MAX_DESCRIPTOR_UNIFORM_BLOCK_SIZE cc: mesa-stable Reviewed-by: Dave Airlie (cherry picked from commit 25e678a37d67aafa4659ab4ed35ac7849fa1f7d4) Part-of: --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1fc90106d4e..907601a4d61 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -284,7 +284,7 @@ "description": "lavapipe: Bump MAX_DESCRIPTOR_UNIFORM_BLOCK_SIZE", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index 7e1ae63488f..f076307e29e 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -100,7 +100,7 @@ extern "C" { #define MAX_DESCRIPTORS 1000000 /* Required by vkd3d-proton */ #define MAX_PUSH_CONSTANTS_SIZE 256 #define MAX_PUSH_DESCRIPTORS 32 -#define MAX_DESCRIPTOR_UNIFORM_BLOCK_SIZE 4096 +#define MAX_DESCRIPTOR_UNIFORM_BLOCK_SIZE MAX_DESCRIPTORS #define MAX_PER_STAGE_DESCRIPTOR_UNIFORM_BLOCKS 8 #define MAX_DGC_STREAMS 16 #define MAX_DGC_TOKENS 16