From c71ca65405e677ac65d176cd4d6138923df6cd56 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 20 May 2019 06:24:06 -0600 Subject: [PATCH] svga: clamp max_const_buffers to SVGA_MAX_CONST_BUFS In case the device reports 15 (or more) buffers. Reviewed-by: Charmaine Lee --- src/gallium/drivers/svga/svga_screen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 92f51ebe919..5300fada9ff 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -1079,7 +1079,8 @@ svga_screen_create(struct svga_winsys_screen *sws) /* Maximum number of constant buffers */ svgascreen->max_const_buffers = get_uint_cap(sws, SVGA3D_DEVCAP_DX_MAX_CONSTANT_BUFFERS, 1); - assert(svgascreen->max_const_buffers <= SVGA_MAX_CONST_BUFS); + svgascreen->max_const_buffers = MIN2(svgascreen->max_const_buffers, + SVGA_MAX_CONST_BUFS); screen->is_format_supported = svga_is_dx_format_supported; } -- 2.30.2