From 645e297a0019eb2f7513bd801ffdaac03187f29f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 26 Jan 2010 12:47:51 -0700 Subject: vbo: clamp DrawElements start/end to max possible values Some apps are sloppy with their start/end values. Clamp them to max possible values to prevent problems later. --- src/mesa/vbo/vbo_exec_array.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/mesa/vbo/vbo_exec_array.c') diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index 2c82f7c9c5c..f4553825921 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -688,6 +688,16 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode, * or we can read/write out of memory in several different places! */ + /* Catch/fix some potential user errors */ + if (type == GL_UNSIGNED_BYTE) { + start = MIN2(start, 0xff); + end = MIN2(end, 0xff); + } + else if (type == GL_UNSIGNED_SHORT) { + start = MIN2(start, 0xffff); + end = MIN2(end, 0xffff); + } + if (end >= ctx->Array.ArrayObj->_MaxElement) { /* the max element is out of bounds of one or more enabled arrays */ warnCount++; -- cgit v1.2.3