projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: s/primcount/numInstances/
[mesa.git]
/
src
/
mesa
/
main
/
api_validate.c
diff --git
a/src/mesa/main/api_validate.c
b/src/mesa/main/api_validate.c
index 150bc3886cfee566b9d95cd52da0b6685863cfdb..7c4652f747f8c8963c1c8e41008f4ac0bc742a65 100644
(file)
--- a/
src/mesa/main/api_validate.c
+++ b/
src/mesa/main/api_validate.c
@@
-27,6
+27,7
@@
#include "bufferobj.h"
#include "context.h"
#include "imports.h"
#include "bufferobj.h"
#include "context.h"
#include "imports.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "vbo/vbo.h"
#include "mtypes.h"
#include "vbo/vbo.h"
@@
-54,7
+55,7
@@
index_bytes(GLenum type, GLsizei count)
* Find the max index in the given element/index buffer
*/
GLuint
* Find the max index in the given element/index buffer
*/
GLuint
-_mesa_max_buffer_index(
GL
context *ctx, GLuint count, GLenum type,
+_mesa_max_buffer_index(
struct gl_
context *ctx, GLuint count, GLenum type,
const void *indices,
struct gl_buffer_object *elementBuf)
{
const void *indices,
struct gl_buffer_object *elementBuf)
{
@@
-99,7
+100,7
@@
_mesa_max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
* Check if OK to draw arrays/elements.
*/
static GLboolean
* Check if OK to draw arrays/elements.
*/
static GLboolean
-check_valid_to_render(
GL
context *ctx, const char *function)
+check_valid_to_render(
struct gl_
context *ctx, const char *function)
{
if (!_mesa_valid_to_render(ctx, function)) {
return GL_FALSE;
{
if (!_mesa_valid_to_render(ctx, function)) {
return GL_FALSE;
@@
-140,7
+141,7
@@
check_valid_to_render(GLcontext *ctx, const char *function)
* \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds
*/
static GLboolean
* \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds
*/
static GLboolean
-check_index_bounds(
GL
context *ctx, GLsizei count, GLenum type,
+check_index_bounds(
struct gl_
context *ctx, GLsizei count, GLenum type,
const GLvoid *indices, GLint basevertex)
{
struct _mesa_prim prim;
const GLvoid *indices, GLint basevertex)
{
struct _mesa_prim prim;
@@
-181,7
+182,7
@@
check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
-_mesa_validate_DrawElements(
GL
context *ctx,
+_mesa_validate_DrawElements(
struct gl_
context *ctx,
GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices, GLint basevertex)
{
GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices, GLint basevertex)
{
@@
-193,7
+194,7
@@
_mesa_validate_DrawElements(GLcontext *ctx,
return GL_FALSE;
}
return GL_FALSE;
}
- if (mode > GL_
POLYGON
) {
+ if (mode > GL_
TRIANGLE_STRIP_ADJACENCY_ARB
) {
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );
return GL_FALSE;
}
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );
return GL_FALSE;
}
@@
-237,7
+238,7
@@
_mesa_validate_DrawElements(GLcontext *ctx,
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
-_mesa_validate_DrawRangeElements(
GL
context *ctx, GLenum mode,
+_mesa_validate_DrawRangeElements(
struct gl_
context *ctx, GLenum mode,
GLuint start, GLuint end,
GLsizei count, GLenum type,
const GLvoid *indices, GLint basevertex)
GLuint start, GLuint end,
GLsizei count, GLenum type,
const GLvoid *indices, GLint basevertex)
@@
-250,7
+251,7
@@
_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
return GL_FALSE;
}
return GL_FALSE;
}
- if (mode > GL_
POLYGON
) {
+ if (mode > GL_
TRIANGLE_STRIP_ADJACENCY_ARB
) {
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );
return GL_FALSE;
}
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );
return GL_FALSE;
}
@@
-298,7
+299,7
@@
_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
* \return GL_TRUE if OK to render, GL_FALSE if error found
*/
GLboolean
-_mesa_validate_DrawArrays(
GL
context *ctx,
+_mesa_validate_DrawArrays(
struct gl_
context *ctx,
GLenum mode, GLint start, GLsizei count)
{
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
GLenum mode, GLint start, GLsizei count)
{
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@
-309,7
+310,7
@@
_mesa_validate_DrawArrays(GLcontext *ctx,
return GL_FALSE;
}
return GL_FALSE;
}
- if (mode > GL_
POLYGON
) {
+ if (mode > GL_
TRIANGLE_STRIP_ADJACENCY_ARB
) {
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
return GL_FALSE;
}
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
return GL_FALSE;
}
@@
-327,8
+328,8
@@
_mesa_validate_DrawArrays(GLcontext *ctx,
GLboolean
GLboolean
-_mesa_validate_DrawArraysInstanced(
GL
context *ctx, GLenum mode, GLint first,
- GLsizei count, GLsizei
primcount
)
+_mesa_validate_DrawArraysInstanced(
struct gl_
context *ctx, GLenum mode, GLint first,
+ GLsizei count, GLsizei
numInstances
)
{
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
{
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@
-339,16
+340,16
@@
_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
return GL_FALSE;
}
return GL_FALSE;
}
- if (mode > GL_
POLYGON
) {
+ if (mode > GL_
TRIANGLE_STRIP_ADJACENCY_ARB
) {
_mesa_error(ctx, GL_INVALID_ENUM,
"glDrawArraysInstanced(mode=0x%x)", mode);
return GL_FALSE;
}
_mesa_error(ctx, GL_INVALID_ENUM,
"glDrawArraysInstanced(mode=0x%x)", mode);
return GL_FALSE;
}
- if (
primcount
<= 0) {
- if (
primcount
< 0)
+ if (
numInstances
<= 0) {
+ if (
numInstances
< 0)
_mesa_error(ctx, GL_INVALID_VALUE,
_mesa_error(ctx, GL_INVALID_VALUE,
- "glDrawArraysInstanced(
primcount=%d)", primcount
);
+ "glDrawArraysInstanced(
numInstances=%d)", numInstances
);
return GL_FALSE;
}
return GL_FALSE;
}
@@
-371,9
+372,9
@@
_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
GLboolean
GLboolean
-_mesa_validate_DrawElementsInstanced(
GL
context *ctx,
+_mesa_validate_DrawElementsInstanced(
struct gl_
context *ctx,
GLenum mode, GLsizei count, GLenum type,
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);
{
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@
-384,7
+385,7
@@
_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
return GL_FALSE;
}
return GL_FALSE;
}
- if (mode > GL_
POLYGON
) {
+ if (mode > GL_
TRIANGLE_STRIP_ADJACENCY_ARB
) {
_mesa_error(ctx, GL_INVALID_ENUM,
"glDrawElementsInstanced(mode = 0x%x)", mode);
return GL_FALSE;
_mesa_error(ctx, GL_INVALID_ENUM,
"glDrawElementsInstanced(mode = 0x%x)", mode);
return GL_FALSE;
@@
-398,10
+399,10
@@
_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
return GL_FALSE;
}
return GL_FALSE;
}
- if (
primcount
<= 0) {
- if (
primcount
< 0)
+ if (
numInstances
<= 0) {
+ if (
numInstances
< 0)
_mesa_error(ctx, GL_INVALID_VALUE,
_mesa_error(ctx, GL_INVALID_VALUE,
- "glDrawElementsInstanced(
primcount=%d)", primcount
);
+ "glDrawElementsInstanced(
numInstances=%d)", numInstances
);
return GL_FALSE;
}
return GL_FALSE;
}