From: Brian Paul Date: Mon, 20 May 2019 12:24:06 +0000 (-0600) Subject: svga: clamp max_const_buffers to SVGA_MAX_CONST_BUFS X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c71ca65405e677ac65d176cd4d6138923df6cd56;p=mesa.git svga: clamp max_const_buffers to SVGA_MAX_CONST_BUFS In case the device reports 15 (or more) buffers. Reviewed-by: Charmaine Lee --- 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; }