fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 21:30:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vbo: optimize validation for glMultiDrawElements

Browse source 
Some parameters need to be checked only once.
check_valid_to_render needs to be called only once.

The validate function is based on the one for DrawElements.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2012-06-27 06:29:42 +02:00
parent 62b9716739
commit fcebb157f0
3 changed files with 82 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/mesa/main/api_validate.c
View file

@ -317,6 +317,76 @@ _mesa_validate_DrawElements(struct gl_context *ctx,
}
/**
* Error checking for glMultiDrawElements(). Includes parameter checking
* and VBO bounds checking.
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
_mesa_validate_MultiDrawElements(struct gl_context *ctx,
GLenum mode, const GLsizei *count,
GLenum type, const GLvoid * const *indices,
GLuint primcount, const GLint *basevertex)
{
unsigned i;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);
for (i = 0; i < primcount; i++) {
if (count[i] <= 0) {
if (count[i] < 0)
_mesa_error(ctx, GL_INVALID_VALUE,
"glMultiDrawElements(count)" );
return GL_FALSE;
}
}
if (!_mesa_valid_prim_mode(ctx, mode, "glMultiDrawElements")) {
return GL_FALSE;
}
if (type != GL_UNSIGNED_INT &&
type != GL_UNSIGNED_BYTE &&
type != GL_UNSIGNED_SHORT)
{
_mesa_error(ctx, GL_INVALID_ENUM, "glMultiDrawElements(type)" );
return GL_FALSE;
}
if (!check_valid_to_render(ctx, "glMultiDrawElements"))
return GL_FALSE;
/* Vertex buffer object tests */
if (_mesa_is_bufferobj(ctx->Array.ArrayObj->ElementArrayBufferObj)) {
/* use indices in the buffer object */
/* make sure count doesn't go outside buffer bounds */
for (i = 0; i < primcount; i++) {
if (index_bytes(type, count[i]) >
ctx->Array.ArrayObj->ElementArrayBufferObj->Size) {
_mesa_warning(ctx,
"glMultiDrawElements index out of buffer bounds");
return GL_FALSE;
}
}
}
else {
/* not using a VBO */
for (i = 0; i < primcount; i++) {
if (!indices[i])
return GL_FALSE;
}
}
for (i = 0; i < primcount; i++) {
if (!check_index_bounds(ctx, count[i], type, indices[i],
basevertex ? basevertex[i] : 0))
return GL_FALSE;
}
return GL_TRUE;
}
/**
* Error checking for glDrawRangeElements(). Includes parameter checking
* and VBO bounds checking.

6
src/mesa/main/api_validate.h
View file

@ -55,6 +55,12 @@ _mesa_validate_DrawElements(struct gl_context *ctx,
GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices, GLint basevertex);
extern GLboolean
_mesa_validate_MultiDrawElements(struct gl_context *ctx,
GLenum mode, const GLsizei *count,
GLenum type, const GLvoid * const *indices,
GLuint primcount, const GLint *basevertex);
extern GLboolean
_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,
GLuint start, GLuint end,

18
src/mesa/vbo/vbo_exec_array.c
View file

@ -1254,13 +1254,10 @@ vbo_exec_MultiDrawElements(GLenum mode,
GLsizei primcount)
{
GET_CURRENT_CONTEXT(ctx);
GLint i;
for (i = 0; i < primcount; i++) {
if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],
0))
return;
}
if (!_mesa_validate_MultiDrawElements(ctx, mode, count, type, indices,
primcount, NULL))
return;
vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,
NULL);
@ -1275,13 +1272,10 @@ vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
const GLsizei *basevertex)
{
GET_CURRENT_CONTEXT(ctx);
GLint i;
for (i = 0; i < primcount; i++) {
if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],
basevertex[i]))
return;
}
if (!_mesa_validate_MultiDrawElements(ctx, mode, count, type, indices,
primcount, basevertex))
return;
vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,
basevertex);