From e82692e521240c5f8592f9ce56c9d5b3d68870ec Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 5 Dec 2012 09:14:52 +0100 Subject: mesa git update 5 dec 2012 mesa: 484a8dcfa8c8b91b8e99174b5e4953264f32789e --- mesalib/src/gallium/auxiliary/util/u_draw.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mesalib/src/gallium/auxiliary/util/u_draw.c') diff --git a/mesalib/src/gallium/auxiliary/util/u_draw.c b/mesalib/src/gallium/auxiliary/util/u_draw.c index 5b3c41231..83d9284b8 100644 --- a/mesalib/src/gallium/auxiliary/util/u_draw.c +++ b/mesalib/src/gallium/auxiliary/util/u_draw.c @@ -108,8 +108,15 @@ util_draw_max_index( else { /* Per-instance data. Simply make sure the state tracker didn't * request more instances than those that fit in the buffer */ - assert((info->start_instance + info->instance_count)/element->instance_divisor - <= (buffer_max_index + 1)); + if ((info->start_instance + info->instance_count)/element->instance_divisor + > (buffer_max_index + 1)) { + /* FIXME: We really should stop thinking in terms of maximum + * indices/instances and simply start clamping against buffer + * size. */ + debug_printf("%s: too many instances for vertex buffer\n", + __FUNCTION__); + return 0; + } } } } -- cgit v1.2.3