From 64fd494f67ce666942d66cc0fcc8806ce4221aeb Mon Sep 17 00:00:00 2001 From: Christoph Neuhauser Date: Fri, 5 Sep 2025 14:19:57 +0200 Subject: [PATCH] iris: Increase max_shader_buffer_size to max_buffer_size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit increases max_shader_buffer_size to max_buffer_size for Iris. Signed-off-by: Christoph Neuhauser Co-authored-by: Lionel Landwerlin Reviewed-by: Lionel Landwerlin Reviewed-by: Tapani Pälli Cc: mesa-stable Part-of: (cherry picked from commit 2f8b8649f015720fd1ac08f779accbfb4701c074) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d5955d92963..3763d6db3f8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8104,7 +8104,7 @@ "description": "iris: Increase max_shader_buffer_size to max_buffer_size", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index 177c398302a..8f4eaf3c329 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -413,7 +413,7 @@ iris_init_screen_caps(struct iris_screen *screen) caps->constant_buffer_offset_alignment = 32; caps->min_map_buffer_alignment = IRIS_MAP_BUFFER_ALIGNMENT; caps->shader_buffer_offset_alignment = 4; - caps->max_shader_buffer_size = 1 << 27; + caps->max_shader_buffer_size = (unsigned)MIN2(screen->isl_dev.max_buffer_size, UINT32_MAX); caps->texture_buffer_offset_alignment = 16; // XXX: u_screen says 256 is the minimum value... caps->linear_image_pitch_alignment = 1; caps->linear_image_base_address_alignment = 1;