diff --git a/ref/gl/gl2_shim/gl2_shim.c b/ref/gl/gl2_shim/gl2_shim.c index 19907561..988b8154 100644 --- a/ref/gl/gl2_shim/gl2_shim.c +++ b/ref/gl/gl2_shim/gl2_shim.c @@ -1401,7 +1401,7 @@ static unsigned int GL2_GetArrIdx( GLenum array ) case GL_COLOR_ARRAY: return GL2_ATTR_COLOR; case GL_TEXTURE_COORD_ARRAY: - ASSERT( gl2wrap_state.tmu < 2 ); + Assert( gl2wrap_state.tmu < 2 ); return GL2_ATTR_TEXCOORD0 + gl2wrap_state.tmu; } return 0; diff --git a/ref/gl/gl_context.c b/ref/gl/gl_context.c index ab099b1a..db572995 100644 --- a/ref/gl/gl_context.c +++ b/ref/gl/gl_context.c @@ -135,7 +135,7 @@ static void Mod_UnloadTextures( model_t *mod ) Mod_SpriteUnloadTextures( mod->cache.data ); break; default: - ASSERT( 0 ); + Assert( 0 ); break; } } diff --git a/ref/gl/gl_image.c b/ref/gl/gl_image.c index dfb9092f..d929a55c 100644 --- a/ref/gl/gl_image.c +++ b/ref/gl/gl_image.c @@ -46,7 +46,7 @@ acess to array elem */ gl_texture_t *R_GetTexture( GLenum texnum ) { - ASSERT( texnum >= 0 && texnum < MAX_TEXTURES ); + Assert( texnum >= 0 && texnum < MAX_TEXTURES ); return &gl_textures[texnum]; } @@ -635,7 +635,7 @@ static void GL_SetTextureTarget( gl_texture_t *tex, rgbdata_t *pic ) #if !XASH_GLES if( pic->width > 1 && pic->height <= 1 ) tex->target = GL_TEXTURE_1D; - else + else #endif // just skip first condition if( FBitSet( pic->flags, IMAGE_CUBEMAP )) tex->target = GL_TEXTURE_CUBE_MAP_ARB; @@ -1458,7 +1458,7 @@ static void GL_DeleteTexture( gl_texture_t *tex ) gl_texture_t **prev; gl_texture_t *cur; - ASSERT( tex != NULL ); + Assert( tex != NULL ); // already freed? if( !tex->texnum ) return; diff --git a/ref/gl/gl_local.h b/ref/gl/gl_local.h index 9acb1058..a648c849 100644 --- a/ref/gl/gl_local.h +++ b/ref/gl/gl_local.h @@ -53,7 +53,6 @@ void VGL_ShimEndFrame( void ); #endif #endif -#define ASSERT(x) if(!( x )) gEngfuncs.Host_Error( "assert failed at %s:%i\n", __FILE__, __LINE__ ) #define Assert(x) if(!( x )) gEngfuncs.Host_Error( "assert failed at %s:%i\n", __FILE__, __LINE__ ) #include diff --git a/ref/gl/gl_rsurf.c b/ref/gl/gl_rsurf.c index 0a2f33f9..7f3991c7 100644 --- a/ref/gl/gl_rsurf.c +++ b/ref/gl/gl_rsurf.c @@ -2107,7 +2107,7 @@ void R_GenerateVBO( void ) pglBindBufferARB( GL_ARRAY_BUFFER_ARB, vbo->glindex ); pglBufferDataARB( GL_ARRAY_BUFFER_ARB, vbo->array_len * sizeof( vbovertex_t ), vbo->array, GL_STATIC_DRAW_ARB ); - ASSERT( len == vbo->array_len ); + Assert( len == vbo->array_len ); vbo = vbo->next; vbotex = vbotex->next; @@ -2146,7 +2146,7 @@ void R_GenerateVBO( void ) } } } - ASSERT( len == vbo->array_len ); + Assert( len == vbo->array_len ); // upload last array pglGenBuffersARB( 1, &vbo->glindex ); @@ -3180,7 +3180,7 @@ void R_DrawVBO( qboolean drawlightmap, qboolean drawtextures ) if( !vbotex->vboarray ) continue; - // ASSERT( vbotex->vboarray == vbo ); + // Assert( vbotex->vboarray == vbo ); if( vbotex->vboarray != vbo ) continue; @@ -3231,7 +3231,7 @@ void R_DrawVBO( qboolean drawlightmap, qboolean drawtextures ) if( !drawtextures || !drawlightmap ) vbos.decaldata->lm[k] = NULL; } - // ASSERT( !vbo->next ); + // Assert( !vbo->next ); R_ClearVBOState( drawlightmap, drawtextures ); mtst.details_enabled = false;