projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glthread: handle ARB_vertex_attrib_binding
[mesa.git]
/
src
/
mesa
/
main
/
draw_validate.c
diff --git
a/src/mesa/main/draw_validate.c
b/src/mesa/main/draw_validate.c
index 779cd1c12c74d9146850d937fa34d74e073e9737..5a1f6d2a194bbb5ebd24569a278c01c319b9d7a9 100644
(file)
--- a/
src/mesa/main/draw_validate.c
+++ b/
src/mesa/main/draw_validate.c
@@
-28,7
+28,7
@@
#include "arrayobj.h"
#include "bufferobj.h"
#include "context.h"
#include "arrayobj.h"
#include "bufferobj.h"
#include "context.h"
-#include "imports.h"
+
#include "mtypes.h"
#include "pipelineobj.h"
#include "enums.h"
#include "mtypes.h"
#include "pipelineobj.h"
#include "enums.h"
@@
-773,7
+773,7
@@
_mesa_validate_MultiDrawElements(struct gl_context *ctx,
/* Not using a VBO for indices, so avoid NULL pointer derefs later.
*/
/* Not using a VBO for indices, so avoid NULL pointer derefs later.
*/
- if (!
_mesa_is_bufferobj(ctx->Array.VAO->IndexBufferObj)
) {
+ if (!
ctx->Array.VAO->IndexBufferObj
) {
for (i = 0; i < primcount; i++) {
if (!indices[i])
return GL_FALSE;
for (i = 0; i < primcount; i++) {
if (!indices[i])
return GL_FALSE;
@@
-1161,7
+1161,7
@@
valid_draw_indirect(struct gl_context *ctx,
return GL_FALSE;
}
return GL_FALSE;
}
- if (!
_mesa_is_bufferobj(ctx->DrawIndirectBuffer)
) {
+ if (!
ctx->DrawIndirectBuffer
) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s: no buffer bound to DRAW_INDIRECT_BUFFER", name);
return GL_FALSE;
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s: no buffer bound to DRAW_INDIRECT_BUFFER", name);
return GL_FALSE;
@@
-1203,7
+1203,7
@@
valid_draw_indirect_elements(struct gl_context *ctx,
* If no element array buffer is bound, an INVALID_OPERATION error is
* generated.
*/
* If no element array buffer is bound, an INVALID_OPERATION error is
* generated.
*/
- if (!
_mesa_is_bufferobj(ctx->Array.VAO->IndexBufferObj)
) {
+ if (!
ctx->Array.VAO->IndexBufferObj
) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(no buffer bound to GL_ELEMENT_ARRAY_BUFFER)", name);
return GL_FALSE;
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(no buffer bound to GL_ELEMENT_ARRAY_BUFFER)", name);
return GL_FALSE;
@@
-1345,7
+1345,7
@@
valid_draw_indirect_parameters(struct gl_context *ctx,
* MultiDrawElementsIndirectCountARB if no buffer is bound to the
* PARAMETER_BUFFER_ARB binding point."
*/
* MultiDrawElementsIndirectCountARB if no buffer is bound to the
* PARAMETER_BUFFER_ARB binding point."
*/
- if (!
_mesa_is_bufferobj(ctx->ParameterBuffer)
) {
+ if (!
ctx->ParameterBuffer
) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s: no buffer bound to PARAMETER_BUFFER", name);
return GL_FALSE;
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s: no buffer bound to PARAMETER_BUFFER", name);
return GL_FALSE;