diff options
| author | Brian Paul <brianp@vmware.com> | 2011-01-17 09:33:47 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-01-17 09:33:49 -0700 |
| commit | 72f2551017e03f888d63fa9040120740c6d40620 (patch) | |
| tree | d9a00ecb8ab722292b1106f7805fe3f9ad779a12 /src/mesa/main/api_validate.c | |
| parent | 2bf52e7c28e6d48374c3c4314e06e3600d7f668a (diff) | |
| download | external_mesa3d-72f2551017e03f888d63fa9040120740c6d40620.zip external_mesa3d-72f2551017e03f888d63fa9040120740c6d40620.tar.gz external_mesa3d-72f2551017e03f888d63fa9040120740c6d40620.tar.bz2 | |
mesa: s/primcount/numInstances/
primcount is also a parameter to glMultiDrawElements(). Use numInstances
to avoid confusion between these things.
Diffstat (limited to 'src/mesa/main/api_validate.c')
| -rw-r--r-- | src/mesa/main/api_validate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index ac9709d..7c4652f 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -329,7 +329,7 @@ _mesa_validate_DrawArrays(struct gl_context *ctx, GLboolean _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first, - GLsizei count, GLsizei primcount) + GLsizei count, GLsizei numInstances) { ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -346,10 +346,10 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi return GL_FALSE; } - if (primcount <= 0) { - if (primcount < 0) + if (numInstances <= 0) { + if (numInstances < 0) _mesa_error(ctx, GL_INVALID_VALUE, - "glDrawArraysInstanced(primcount=%d)", primcount); + "glDrawArraysInstanced(numInstances=%d)", numInstances); return GL_FALSE; } @@ -374,7 +374,7 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi GLboolean _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLsizei primcount) + const GLvoid *indices, GLsizei numInstances) { ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -399,10 +399,10 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, return GL_FALSE; } - if (primcount <= 0) { - if (primcount < 0) + if (numInstances <= 0) { + if (numInstances < 0) _mesa_error(ctx, GL_INVALID_VALUE, - "glDrawElementsInstanced(primcount=%d)", primcount); + "glDrawElementsInstanced(numInstances=%d)", numInstances); return GL_FALSE; } |