diff options
| author | Matt Turner <mattst88@gmail.com> | 2015-02-20 20:18:47 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-02-23 10:49:47 -0800 |
| commit | bfcdb843830bba0190e00e35e3c5c18c4bdb5de1 (patch) | |
| tree | d4e8eebb5d58b3b1ac6caa383bfcda258b19c6c1 /src/mesa/main/arrayobj.c | |
| parent | 52049f8fd83f2ef31c2a4d645cfb7d7b2ab518a6 (diff) | |
| download | external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.zip external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.tar.gz external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.tar.bz2 | |
mesa: Use assert() instead of ASSERT wrapper.
Acked-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/main/arrayobj.c')
| -rw-r--r-- | src/mesa/main/arrayobj.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 6440ea6..bdbd169 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -143,7 +143,7 @@ _mesa_reference_vao_(struct gl_context *ctx, struct gl_vertex_array_object *oldObj = *ptr; mtx_lock(&oldObj->Mutex); - ASSERT(oldObj->RefCount > 0); + assert(oldObj->RefCount > 0); oldObj->RefCount--; #if 0 printf("ArrayObj %p %d DECR to %d\n", @@ -153,13 +153,13 @@ _mesa_reference_vao_(struct gl_context *ctx, mtx_unlock(&oldObj->Mutex); if (deleteFlag) { - ASSERT(ctx->Driver.DeleteArrayObject); + assert(ctx->Driver.DeleteArrayObject); ctx->Driver.DeleteArrayObject(ctx, oldObj); } *ptr = NULL; } - ASSERT(!*ptr); + assert(!*ptr); if (vao) { /* reference new array object */ @@ -335,7 +335,7 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired) struct gl_vertex_array_object * const oldObj = ctx->Array.VAO; struct gl_vertex_array_object *newObj = NULL; - ASSERT(oldObj != NULL); + assert(oldObj != NULL); if ( oldObj->Name == id ) return; /* rebinding the same array object- no change */ @@ -456,7 +456,7 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids) struct gl_vertex_array_object *obj = _mesa_lookup_vao(ctx, ids[i]); if ( obj != NULL ) { - ASSERT( obj->Name == ids[i] ); + assert( obj->Name == ids[i] ); /* If the array object is currently bound, the spec says "the binding * for that object reverts to zero and the default vertex array |