From 99b44536bf2335989cad6ef33d148115fd4316cf Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 2 Jul 2020 15:41:51 -0400 Subject: [PATCH] zink: clamp PIPE_SHADER_CAP_MAX_SHADER_BUFFERS to PIPE_MAX_SHADER_BUFFERS this value gets split between ssbos and abos, so clamping to 8 here causes a number of tests to fail just because there's not enough buffers available other gallium drivers return 32 here, so this seems pretty safe Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index ad46d60b097..248c7efc650 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -458,7 +458,7 @@ zink_get_shader_param(struct pipe_screen *pscreen, case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS: /* TODO: this limitation is dumb, and will need some fixes in mesa */ - return MIN2(screen->props.limits.maxPerStageDescriptorStorageBuffers, 8); + return MIN2(screen->props.limits.maxPerStageDescriptorStorageBuffers, PIPE_MAX_SHADER_BUFFERS); case PIPE_SHADER_CAP_SUPPORTED_IRS: return (1 << PIPE_SHADER_IR_NIR) | (1 << PIPE_SHADER_IR_TGSI); -- 2.30.2