RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ref: gl: remove excessive ASSERT macro, use Assert everywhere

Browse Source
This commit is contained in:
Alibek Omarov
2025-09-06 00:41:48 +05:00
parent 598d756af1
commit 699e178f62
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ref/gl/gl2_shim/gl2_shim.c
View File

@@ -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;

2
ref/gl/gl_context.c
View File

@@ -135,7 +135,7 @@ static void Mod_UnloadTextures( model_t *mod )
Mod_SpriteUnloadTextures( mod->cache.data );
break;
default:
ASSERT( 0 );
Assert( 0 );
break;
}
}

6
ref/gl/gl_image.c
View File

@@ -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;

1
ref/gl/gl_local.h
View File

@@ -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 <stdio.h>

8
ref/gl/gl_rsurf.c
View File

@@ -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;