diff options
Diffstat (limited to 'src/gl_main.c')
| -rw-r--r-- | src/gl_main.c | 732 |
1 files changed, 382 insertions, 350 deletions
diff --git a/src/gl_main.c b/src/gl_main.c index e698581..c1566df 100644 --- a/src/gl_main.c +++ b/src/gl_main.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* * gl_main.c - * + * */ #include "gl_local.h" @@ -83,69 +83,71 @@ cvar_t *gl_showerrors; // ============================================================================== -static void GL_SetupFrustum( void ) { +static void GL_SetupFrustum(void) +{ cplane_t *f; vec3_t forward, left, up; vec_t fovSin, fovCos, angle; - angle = DEG2RAD( glr.fd.fov_x / 2 ); - fovSin = sin( angle ); - fovCos = cos( angle ); + angle = DEG2RAD(glr.fd.fov_x / 2); + fovSin = sin(angle); + fovCos = cos(angle); - VectorScale( glr.viewaxis[0], fovSin, forward ); - VectorScale( glr.viewaxis[1], fovCos, left ); + VectorScale(glr.viewaxis[0], fovSin, forward); + VectorScale(glr.viewaxis[1], fovCos, left); /* right side */ f = &glr.frustumPlanes[0]; - VectorAdd( forward, left, f->normal ); - f->dist = DotProduct( glr.fd.vieworg, f->normal ); + VectorAdd(forward, left, f->normal); + f->dist = DotProduct(glr.fd.vieworg, f->normal); f->type = PLANE_NON_AXIAL; - SetPlaneSignbits( f ); + SetPlaneSignbits(f); /* left side */ f = &glr.frustumPlanes[1]; - VectorSubtract( forward, left, f->normal ); - f->dist = DotProduct( glr.fd.vieworg, f->normal ); + VectorSubtract(forward, left, f->normal); + f->dist = DotProduct(glr.fd.vieworg, f->normal); f->type = PLANE_NON_AXIAL; - SetPlaneSignbits( f ); + SetPlaneSignbits(f); - angle = DEG2RAD( glr.fd.fov_y / 2 ); - fovSin = sin( angle ); - fovCos = cos( angle ); + angle = DEG2RAD(glr.fd.fov_y / 2); + fovSin = sin(angle); + fovCos = cos(angle); - VectorScale( glr.viewaxis[0], fovSin, forward ); - VectorScale( glr.viewaxis[2], fovCos, up ); + VectorScale(glr.viewaxis[0], fovSin, forward); + VectorScale(glr.viewaxis[2], fovCos, up); /* up side */ f = &glr.frustumPlanes[2]; - VectorAdd( forward, up, f->normal ); - f->dist = DotProduct( glr.fd.vieworg, f->normal ); + VectorAdd(forward, up, f->normal); + f->dist = DotProduct(glr.fd.vieworg, f->normal); f->type = PLANE_NON_AXIAL; - SetPlaneSignbits( f ); + SetPlaneSignbits(f); /* down side */ f = &glr.frustumPlanes[3]; - VectorSubtract( forward, up, f->normal ); - f->dist = DotProduct( glr.fd.vieworg, f->normal ); + VectorSubtract(forward, up, f->normal); + f->dist = DotProduct(glr.fd.vieworg, f->normal); f->type = PLANE_NON_AXIAL; - SetPlaneSignbits( f ); + SetPlaneSignbits(f); } -glCullResult_t GL_CullBox( vec3_t bounds[2] ) { +glCullResult_t GL_CullBox(vec3_t bounds[2]) +{ int i, bits; glCullResult_t cull; - if( !gl_cull_models->integer ) { + if (!gl_cull_models->integer) { return CULL_IN; } - + cull = CULL_IN; - for( i = 0; i < 4; i++ ) { - bits = BoxOnPlaneSide( bounds[0], bounds[1], &glr.frustumPlanes[i] ); - if( bits == BOX_BEHIND ) { + for (i = 0; i < 4; i++) { + bits = BoxOnPlaneSide(bounds[0], bounds[1], &glr.frustumPlanes[i]); + if (bits == BOX_BEHIND) { return CULL_OUT; } - if( bits != BOX_INFRONT ) { + if (bits != BOX_INFRONT) { cull = CULL_CLIP; } } @@ -153,23 +155,24 @@ glCullResult_t GL_CullBox( vec3_t bounds[2] ) { return cull; } -glCullResult_t GL_CullSphere( const vec3_t origin, float radius ) { +glCullResult_t GL_CullSphere(const vec3_t origin, float radius) +{ float dist; cplane_t *p; int i; glCullResult_t cull; - if( !gl_cull_models->integer ) { + if (!gl_cull_models->integer) { return CULL_IN; } cull = CULL_IN; - for( i = 0, p = glr.frustumPlanes; i < 4; i++, p++ ) { - dist = PlaneDiff( origin, p ); - if( dist < -radius ) { + for (i = 0, p = glr.frustumPlanes; i < 4; i++, p++) { + dist = PlaneDiff(origin, p); + if (dist < -radius) { return CULL_OUT; } - if( dist <= radius ) { + if (dist <= radius) { cull = CULL_CLIP; } } @@ -177,22 +180,23 @@ glCullResult_t GL_CullSphere( const vec3_t origin, float radius ) { return cull; } -static inline void make_box_points( const vec3_t origin, - vec3_t bounds[2], - vec3_t points[8] ) +static inline void make_box_points(const vec3_t origin, + vec3_t bounds[2], + vec3_t points[8]) { int i; - for( i = 0; i < 8; i++ ) { - VectorCopy( origin, points[i] ); - VectorMA( points[i], bounds[(i>>0)&1][0], glr.entaxis[0], points[i] ); - VectorMA( points[i], bounds[(i>>1)&1][1], glr.entaxis[1], points[i] ); - VectorMA( points[i], bounds[(i>>2)&1][2], glr.entaxis[2], points[i] ); + for (i = 0; i < 8; i++) { + VectorCopy(origin, points[i]); + VectorMA(points[i], bounds[(i >> 0) & 1][0], glr.entaxis[0], points[i]); + VectorMA(points[i], bounds[(i >> 1) & 1][1], glr.entaxis[1], points[i]); + VectorMA(points[i], bounds[(i >> 2) & 1][2], glr.entaxis[2], points[i]); } } -glCullResult_t GL_CullLocalBox( const vec3_t origin, vec3_t bounds[2] ) { +glCullResult_t GL_CullLocalBox(const vec3_t origin, vec3_t bounds[2]) +{ vec3_t points[8]; cplane_t *p; int i, j; @@ -200,30 +204,30 @@ glCullResult_t GL_CullLocalBox( const vec3_t origin, vec3_t bounds[2] ) { qboolean infront; glCullResult_t cull; - if( !gl_cull_models->integer ) { + if (!gl_cull_models->integer) { return CULL_IN; } - make_box_points( origin, bounds, points ); + make_box_points(origin, bounds, points); cull = CULL_IN; - for( i = 0, p = glr.frustumPlanes; i < 4; i++, p++ ) { + for (i = 0, p = glr.frustumPlanes; i < 4; i++, p++) { infront = qfalse; - for( j = 0; j < 8; j++ ) { - dot = DotProduct( points[j], p->normal ); - if( dot >= p->dist ) { + for (j = 0; j < 8; j++) { + dot = DotProduct(points[j], p->normal); + if (dot >= p->dist) { infront = qtrue; - if( cull == CULL_CLIP ) { + if (cull == CULL_CLIP) { break; } } else { cull = CULL_CLIP; - if( infront ) { + if (infront) { break; } } } - if( !infront ) { + if (!infront) { return CULL_OUT; } } @@ -232,61 +236,62 @@ glCullResult_t GL_CullLocalBox( const vec3_t origin, vec3_t bounds[2] ) { } #if 0 -void GL_DrawBox( const vec3_t origin, vec3_t bounds[2] ) { +void GL_DrawBox(const vec3_t origin, vec3_t bounds[2]) +{ static const int indices1[4] = { 0, 1, 3, 2 }; static const int indices2[4] = { 4, 5, 7, 6 }; static const int indices3[8] = { 0, 4, 1, 5, 2, 6, 3, 7 }; vec3_t points[8]; - qglDisable( GL_TEXTURE_2D ); - qglDisable( GL_DEPTH_TEST ); - qglDisableClientState( GL_TEXTURE_COORD_ARRAY ); - qglColor4f( 1, 1, 1, 1 ); + qglDisable(GL_TEXTURE_2D); + qglDisable(GL_DEPTH_TEST); + qglDisableClientState(GL_TEXTURE_COORD_ARRAY); + qglColor4f(1, 1, 1, 1); - make_box_points( origin, bounds, points ); + make_box_points(origin, bounds, points); - qglVertexPointer( 3, GL_FLOAT, 0, points ); - qglDrawElements( GL_LINE_LOOP, 4, GL_UNSIGNED_INT, indices1 ); - qglDrawElements( GL_LINE_LOOP, 4, GL_UNSIGNED_INT, indices2 ); - qglDrawElements( GL_LINES, 8, GL_UNSIGNED_INT, indices3 ); + qglVertexPointer(3, GL_FLOAT, 0, points); + qglDrawElements(GL_LINE_LOOP, 4, GL_UNSIGNED_INT, indices1); + qglDrawElements(GL_LINE_LOOP, 4, GL_UNSIGNED_INT, indices2); + qglDrawElements(GL_LINES, 8, GL_UNSIGNED_INT, indices3); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - qglEnable( GL_DEPTH_TEST ); - qglEnable( GL_TEXTURE_2D ); + qglEnableClientState(GL_TEXTURE_COORD_ARRAY); + qglEnable(GL_DEPTH_TEST); + qglEnable(GL_TEXTURE_2D); } #endif // shared between lightmap and scrap allocators -qboolean GL_AllocBlock( int width, int height, int *inuse, - int w, int h, int *s, int *t ) +qboolean GL_AllocBlock(int width, int height, int *inuse, + int w, int h, int *s, int *t) { int i, j, k, x, y, max_inuse, min_inuse; x = 0; y = height; min_inuse = height; - for( i = 0; i < width - w; i++ ) { + for (i = 0; i < width - w; i++) { max_inuse = 0; - for( j = 0; j < w; j++ ) { - k = inuse[ i + j ]; - if( k >= min_inuse ) { + for (j = 0; j < w; j++) { + k = inuse[i + j]; + if (k >= min_inuse) { break; } - if( max_inuse < k ) { + if (max_inuse < k) { max_inuse = k; } } - if( j == w ) { + if (j == w) { x = i; y = min_inuse = max_inuse; } } - if( y + h > height ) { + if (y + h > height) { return qfalse; } - for( i = 0; i < w; i++ ) { - inuse[ x + i ] = y + h; + for (i = 0; i < w; i++) { + inuse[x + i] = y + h; } *s = x; @@ -294,19 +299,20 @@ qboolean GL_AllocBlock( int width, int height, int *inuse, return qtrue; } -static void GL_DrawSpriteModel( model_t *model ) { +static void GL_DrawSpriteModel(model_t *model) +{ static const vec_t tcoords[8] = { 0, 1, 0, 0, 1, 1, 1, 0 }; entity_t *e = glr.ent; mspriteframe_t *frame = &model->spriteframes[e->frame % model->numframes]; image_t *image = frame->image; - float alpha = ( e->flags & RF_TRANSLUCENT ) ? e->alpha : 1; + float alpha = (e->flags & RF_TRANSLUCENT) ? e->alpha : 1; int bits = GLS_DEPTHMASK_FALSE; vec3_t up, down, left, right; vec3_t points[4]; - if( alpha == 1 ) { - if( image->flags & if_transparent ) { - if( image->flags & if_paletted ) { + if (alpha == 1) { + if (image->flags & if_transparent) { + if (image->flags & if_paletted) { bits |= GLS_ALPHATEST_ENABLE; } else { bits |= GLS_BLEND_BLEND; @@ -316,27 +322,28 @@ static void GL_DrawSpriteModel( model_t *model ) { bits |= GLS_BLEND_BLEND; } - GL_TexEnv( GL_MODULATE ); - GL_Bits( bits ); - GL_BindTexture( image->texnum ); - qglColor4f( 1, 1, 1, alpha ); + GL_TexEnv(GL_MODULATE); + GL_Bits(bits); + GL_BindTexture(image->texnum); + qglColor4f(1, 1, 1, alpha); - VectorScale( glr.viewaxis[1], frame->origin_x, left ); - VectorScale( glr.viewaxis[1], frame->origin_x - frame->width, right ); - VectorScale( glr.viewaxis[2], -frame->origin_y, down ); - VectorScale( glr.viewaxis[2], frame->height - frame->origin_y, up ); + VectorScale(glr.viewaxis[1], frame->origin_x, left); + VectorScale(glr.viewaxis[1], frame->origin_x - frame->width, right); + VectorScale(glr.viewaxis[2], -frame->origin_y, down); + VectorScale(glr.viewaxis[2], frame->height - frame->origin_y, up); - VectorAdd3( e->origin, down, left, points[0] ); - VectorAdd3( e->origin, up, left, points[1] ); - VectorAdd3( e->origin, down, right, points[2] ); - VectorAdd3( e->origin, up, right, points[3] ); + VectorAdd3(e->origin, down, left, points[0]); + VectorAdd3(e->origin, up, left, points[1]); + VectorAdd3(e->origin, down, right, points[2]); + VectorAdd3(e->origin, up, right, points[3]); - qglTexCoordPointer( 2, GL_FLOAT, 0, tcoords ); - qglVertexPointer( 3, GL_FLOAT, 0, points ); - qglDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); + qglTexCoordPointer(2, GL_FLOAT, 0, tcoords); + qglVertexPointer(3, GL_FLOAT, 0, points); + qglDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } -static void GL_DrawNullModel( void ) { +static void GL_DrawNullModel(void) +{ static const uint32_t colors[6] = { U32_RED, U32_RED, U32_GREEN, U32_GREEN, @@ -345,116 +352,118 @@ static void GL_DrawNullModel( void ) { entity_t *e = glr.ent; vec3_t points[6]; - VectorCopy( e->origin, points[0] ); - VectorCopy( e->origin, points[2] ); - VectorCopy( e->origin, points[4] ); + VectorCopy(e->origin, points[0]); + VectorCopy(e->origin, points[2]); + VectorCopy(e->origin, points[4]); - VectorMA( e->origin, 16, glr.entaxis[0], points[1] ); - VectorMA( e->origin, 16, glr.entaxis[1], points[3] ); - VectorMA( e->origin, 16, glr.entaxis[2], points[5] ); + VectorMA(e->origin, 16, glr.entaxis[0], points[1]); + VectorMA(e->origin, 16, glr.entaxis[1], points[3]); + VectorMA(e->origin, 16, glr.entaxis[2], points[5]); - qglDisable( GL_TEXTURE_2D ); - //qglDisable( GL_DEPTH_TEST ); - qglDisableClientState( GL_TEXTURE_COORD_ARRAY ); - qglEnableClientState( GL_COLOR_ARRAY ); + qglDisable(GL_TEXTURE_2D); + //qglDisable(GL_DEPTH_TEST); + qglDisableClientState(GL_TEXTURE_COORD_ARRAY); + qglEnableClientState(GL_COLOR_ARRAY); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colors ); - qglVertexPointer( 3, GL_FLOAT, 0, points ); - qglDrawArrays( GL_LINES, 0, 6 ); + qglColorPointer(4, GL_UNSIGNED_BYTE, 0, colors); + qglVertexPointer(3, GL_FLOAT, 0, points); + qglDrawArrays(GL_LINES, 0, 6); - qglDisableClientState( GL_COLOR_ARRAY ); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - //qglEnable( GL_DEPTH_TEST ); - qglEnable( GL_TEXTURE_2D ); + qglDisableClientState(GL_COLOR_ARRAY); + qglEnableClientState(GL_TEXTURE_COORD_ARRAY); + //qglEnable(GL_DEPTH_TEST); + qglEnable(GL_TEXTURE_2D); } -static void GL_DrawEntities( int mask ) { +static void GL_DrawEntities(int mask) +{ entity_t *ent, *last; model_t *model; - if( !gl_drawentities->integer ) { + if (!gl_drawentities->integer) { return; } last = glr.fd.entities + glr.fd.num_entities; - for( ent = glr.fd.entities; ent != last; ent++ ) { - if( ent->flags & RF_BEAM ) { + for (ent = glr.fd.entities; ent != last; ent++) { + if (ent->flags & RF_BEAM) { /* beams are drawn elsewhere in single batch */ glr.num_beams++; continue; } - if( ( ent->flags & RF_TRANSLUCENT ) != mask ) { + if ((ent->flags & RF_TRANSLUCENT) != mask) { continue; } glr.ent = ent; - if( !VectorEmpty( ent->angles ) ) { + if (!VectorEmpty(ent->angles)) { glr.entrotated = qtrue; - AngleVectors( ent->angles, glr.entaxis[0], glr.entaxis[1], glr.entaxis[2] ); - VectorInverse( glr.entaxis[1] ); + AngleVectors(ent->angles, glr.entaxis[0], glr.entaxis[1], glr.entaxis[2]); + VectorInverse(glr.entaxis[1]); } else { glr.entrotated = qfalse; - VectorSet( glr.entaxis[0], 1, 0, 0 ); - VectorSet( glr.entaxis[1], 0, 1, 0 ); - VectorSet( glr.entaxis[2], 0, 0, 1 ); + VectorSet(glr.entaxis[0], 1, 0, 0); + VectorSet(glr.entaxis[1], 0, 1, 0); + VectorSet(glr.entaxis[2], 0, 0, 1); } // inline BSP model - if( ent->model & 0x80000000 ) { + if (ent->model & 0x80000000) { bsp_t *bsp = gl_static.world.cache; int index = ~ent->model; - if( !bsp ) { - Com_Error( ERR_DROP, "%s: inline model without world", - __func__ ); + if (!bsp) { + Com_Error(ERR_DROP, "%s: inline model without world", + __func__); } - if( index < 1 || index >= bsp->nummodels ) { - Com_Error( ERR_DROP, "%s: inline model %d out of range", - __func__, index ); + if (index < 1 || index >= bsp->nummodels) { + Com_Error(ERR_DROP, "%s: inline model %d out of range", + __func__, index); } - GL_DrawBspModel( &bsp->models[index] ); + GL_DrawBspModel(&bsp->models[index]); continue; } - model = MOD_ForHandle( ent->model ); - if( !model ) { + model = MOD_ForHandle(ent->model); + if (!model) { GL_DrawNullModel(); continue; } - switch( model->type ) { + switch (model->type) { case MOD_ALIAS: - GL_DrawAliasModel( model ); + GL_DrawAliasModel(model); break; case MOD_SPRITE: - GL_DrawSpriteModel( model ); + GL_DrawSpriteModel(model); break; case MOD_EMPTY: break; default: - Com_Error( ERR_FATAL, "%s: bad model type", __func__ ); + Com_Error(ERR_FATAL, "%s: bad model type", __func__); } - if( gl_showorigins->integer ) { + if (gl_showorigins->integer) { GL_DrawNullModel(); } } } -static void GL_DrawTearing( void ) { +static void GL_DrawTearing(void) +{ vec2_t points[4]; static int i; // alternate colors to make tearing obvious i++; - if( i & 1 ) { - qglClearColor( 1, 1, 1, 1 ); - qglColor4f( 1, 1, 1, 1 ); + if (i & 1) { + qglClearColor(1, 1, 1, 1); + qglColor4f(1, 1, 1, 1); } else { - qglClearColor( 1, 0, 0, 0 ); - qglColor4f( 1, 0, 0, 1 ); + qglClearColor(1, 0, 0, 0); + qglColor4f(1, 0, 0, 1); } points[0][0] = 0; @@ -466,67 +475,71 @@ static void GL_DrawTearing( void ) { points[3][0] = r_config.width; points[3][1] = 0; - qglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + qglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - qglDisable( GL_TEXTURE_2D ); - qglDisableClientState( GL_TEXTURE_COORD_ARRAY ); + qglDisable(GL_TEXTURE_2D); + qglDisableClientState(GL_TEXTURE_COORD_ARRAY); - qglVertexPointer( 2, GL_FLOAT, 0, points ); - qglDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); + qglVertexPointer(2, GL_FLOAT, 0, points); + qglDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - qglEnable( GL_TEXTURE_2D ); + qglEnableClientState(GL_TEXTURE_COORD_ARRAY); + qglEnable(GL_TEXTURE_2D); - qglClearColor( 0, 0, 0, 1 ); + qglClearColor(0, 0, 0, 1); } -static const char *GL_ErrorString( GLenum err ) { +static const char *GL_ErrorString(GLenum err) +{ const char *str; - switch( err ) { + switch (err) { #define E(x) case GL_##x: str = "GL_"#x; break; - E( NO_ERROR ) - E( INVALID_ENUM ) - E( INVALID_VALUE ) - E( INVALID_OPERATION ) - E( STACK_OVERFLOW ) - E( STACK_UNDERFLOW ) - E( OUT_OF_MEMORY ) - default: str = "UNKNOWN ERROR"; + E(NO_ERROR) + E(INVALID_ENUM) + E(INVALID_VALUE) + E(INVALID_OPERATION) + E(STACK_OVERFLOW) + E(STACK_UNDERFLOW) + E(OUT_OF_MEMORY) + default: str = "UNKNOWN ERROR"; #undef E } return str; } -void GL_ClearErrors( void ) { +void GL_ClearErrors(void) +{ GLenum err; - while( ( err = qglGetError() ) != GL_NO_ERROR ) + while ((err = qglGetError()) != GL_NO_ERROR) ; } -qboolean GL_ShowErrors( const char *func ) { +qboolean GL_ShowErrors(const char *func) +{ GLenum err = qglGetError(); - if( err == GL_NO_ERROR ) { + if (err == GL_NO_ERROR) { return qfalse; } do { - if( gl_showerrors->integer ) { - Com_EPrintf( "%s: %s\n", func, GL_ErrorString( err ) ); + if (gl_showerrors->integer) { + Com_EPrintf("%s: %s\n", func, GL_ErrorString(err)); } - } while( ( err = qglGetError() ) != GL_NO_ERROR ); + } while ((err = qglGetError()) != GL_NO_ERROR); return qtrue; } -void R_RenderFrame( refdef_t *fd ) { +void R_RenderFrame(refdef_t *fd) +{ GL_Flush2D(); - if( !gl_static.world.cache && !( fd->rdflags & RDF_NOWORLDMODEL ) ) { - Com_Error( ERR_FATAL, "%s: NULL worldmodel", __func__ ); + if (!gl_static.world.cache && !(fd->rdflags & RDF_NOWORLDMODEL)) { + Com_Error(ERR_FATAL, "%s: NULL worldmodel", __func__); } glr.drawframe++; @@ -535,98 +548,100 @@ void R_RenderFrame( refdef_t *fd ) { glr.num_beams = 0; #if USE_DLIGHTS - if( gl_dynamic->integer != 1 ) { + if (gl_dynamic->integer != 1) { glr.fd.num_dlights = 0; } #endif - if( lm.dirty ) { + if (lm.dirty) { LM_RebuildSurfaces(); lm.dirty = qfalse; } GL_Setup3D(); - - if( gl_cull_nodes->integer ) { + + if (gl_cull_nodes->integer) { GL_SetupFrustum(); } - if( !( glr.fd.rdflags & RDF_NOWORLDMODEL ) && gl_drawworld->integer ) { + if (!(glr.fd.rdflags & RDF_NOWORLDMODEL) && gl_drawworld->integer) { GL_DrawWorld(); } - GL_DrawEntities( 0 ); + GL_DrawEntities(0); GL_DrawBeams(); GL_DrawParticles(); - GL_DrawEntities( RF_TRANSLUCENT ); + GL_DrawEntities(RF_TRANSLUCENT); GL_DrawAlphaFaces(); // go back into 2D mode GL_Setup2D(); - if( gl_polyblend->integer && glr.fd.blend[3] != 0 ) { + if (gl_polyblend->integer && glr.fd.blend[3] != 0) { GL_Blend(); } #ifdef _DEBUG - if( gl_lightmap->integer > 1 ) { + if (gl_lightmap->integer > 1) { Draw_Lightmaps(); } #endif - GL_ShowErrors( __func__ ); + GL_ShowErrors(__func__); } -void R_BeginFrame( void ) { - if( gl_log->integer ) { +void R_BeginFrame(void) +{ + if (gl_log->integer) { QGL_LogNewFrame(); } - - memset( &c, 0, sizeof( c ) ); - + + memset(&c, 0, sizeof(c)); + GL_Setup2D(); - if( gl_clear->integer ) { - qglClear( GL_COLOR_BUFFER_BIT ); + if (gl_clear->integer) { + qglClear(GL_COLOR_BUFFER_BIT); } - GL_ShowErrors( __func__ ); + GL_ShowErrors(__func__); } -void R_EndFrame( void ) { +void R_EndFrame(void) +{ #ifdef _DEBUG - if( gl_showstats->integer ) { + if (gl_showstats->integer) { GL_Flush2D(); Draw_Stats(); } - if( gl_showscrap->integer ) { + if (gl_showscrap->integer) { Draw_Scrap(); } #endif GL_Flush2D(); - if( gl_showtearing->integer ) { + if (gl_showtearing->integer) { GL_DrawTearing(); } - if( gl_log->modified ) { - QGL_EnableLogging( gl_log->integer ); + if (gl_log->modified) { + QGL_EnableLogging(gl_log->integer); gl_log->modified = qfalse; } // enable/disable fragment programs on the fly - if( gl_fragment_program->modified ) { + if (gl_fragment_program->modified) { GL_ShutdownPrograms(); GL_InitPrograms(); gl_fragment_program->modified = qfalse; } - GL_ShowErrors( __func__ ); - + GL_ShowErrors(__func__); + VID_EndFrame(); // qglFinish(); @@ -634,175 +649,183 @@ void R_EndFrame( void ) { // ============================================================================== -static void GL_Strings_f( void ) { - Com_Printf( "GL_VENDOR: %s\n", gl_config.vendorString ); - Com_Printf( "GL_RENDERER: %s\n", gl_config.rendererString ); - Com_Printf( "GL_VERSION: %s\n", gl_config.versionString ); - Com_Printf( "GL_EXTENSIONS: %s\n", gl_config.extensionsString ); - Com_Printf( "GL_MAX_TEXTURE_SIZE: %d\n", gl_config.maxTextureSize ); - Com_Printf( "GL_MAX_TEXTURE_UNITS: %d\n", gl_config.numTextureUnits ); - Com_Printf( "GL_MAX_TEXTURE_MAX_ANISOTROPY: %d\n", (int)gl_config.maxAnisotropy ); +static void GL_Strings_f(void) +{ + Com_Printf("GL_VENDOR: %s\n", gl_config.vendorString); + Com_Printf("GL_RENDERER: %s\n", gl_config.rendererString); + Com_Printf("GL_VERSION: %s\n", gl_config.versionString); + Com_Printf("GL_EXTENSIONS: %s\n", gl_config.extensionsString); + Com_Printf("GL_MAX_TEXTURE_SIZE: %d\n", gl_config.maxTextureSize); + Com_Printf("GL_MAX_TEXTURE_UNITS: %d\n", gl_config.numTextureUnits); + Com_Printf("GL_MAX_TEXTURE_MAX_ANISOTROPY: %d\n", (int)gl_config.maxAnisotropy); } -static size_t GL_ViewCluster_m( char *buffer, size_t size ) { - return Q_scnprintf( buffer, size, "%d", glr.viewcluster1 ); +static size_t GL_ViewCluster_m(char *buffer, size_t size) +{ + return Q_scnprintf(buffer, size, "%d", glr.viewcluster1); } -static void gl_modulate_entities_changed( cvar_t *self ) { +static void gl_modulate_entities_changed(cvar_t *self) +{ gl_static.entity_modulate = gl_modulate->value * gl_modulate_entities->value; } // this one is defined in gl_surf.c -extern void gl_lightmap_changed( cvar_t *self ); +extern void gl_lightmap_changed(cvar_t *self); -static void gl_modulate_changed( cvar_t *self ) { - gl_lightmap_changed( self ); - gl_modulate_entities_changed( self ); +static void gl_modulate_changed(cvar_t *self) +{ + gl_lightmap_changed(self); + gl_modulate_entities_changed(self); } -static void gl_novis_changed( cvar_t *self ) { +static void gl_novis_changed(cvar_t *self) +{ glr.viewcluster1 = glr.viewcluster2 = -2; } -static void GL_Register( void ) { +static void GL_Register(void) +{ // regular variables - gl_partscale = Cvar_Get( "gl_partscale", "2", 0 ); + gl_partscale = Cvar_Get("gl_partscale", "2", 0); #if USE_CELSHADING - gl_celshading = Cvar_Get( "gl_celshading", "0", 0 ); + gl_celshading = Cvar_Get("gl_celshading", "0", 0); #endif #if USE_DOTSHADING - gl_dotshading = Cvar_Get( "gl_dotshading", "1", 0 ); + gl_dotshading = Cvar_Get("gl_dotshading", "1", 0); #endif - gl_modulate = Cvar_Get( "gl_modulate", "1", CVAR_ARCHIVE ); + gl_modulate = Cvar_Get("gl_modulate", "1", CVAR_ARCHIVE); gl_modulate->changed = gl_modulate_changed; - gl_modulate_world = Cvar_Get( "gl_modulate_world", "1", 0 ); + gl_modulate_world = Cvar_Get("gl_modulate_world", "1", 0); gl_modulate_world->changed = gl_lightmap_changed; - gl_coloredlightmaps = Cvar_Get( "gl_coloredlightmaps", "1", 0 ); + gl_coloredlightmaps = Cvar_Get("gl_coloredlightmaps", "1", 0); gl_coloredlightmaps->changed = gl_lightmap_changed; - gl_brightness = Cvar_Get( "gl_brightness", "0", 0 ); + gl_brightness = Cvar_Get("gl_brightness", "0", 0); gl_brightness->changed = gl_lightmap_changed; - gl_dynamic = Cvar_Get( "gl_dynamic", "2", 0 ); + gl_dynamic = Cvar_Get("gl_dynamic", "2", 0); gl_dynamic->changed = gl_lightmap_changed; #if USE_DLIGHTS - gl_dlight_falloff = Cvar_Get( "gl_dlight_falloff", "1", 0 ); + gl_dlight_falloff = Cvar_Get("gl_dlight_falloff", "1", 0); #endif - gl_modulate_entities = Cvar_Get( "gl_modulate_entities", "1", 0 ); + gl_modulate_entities = Cvar_Get("gl_modulate_entities", "1", 0); gl_modulate_entities->changed = gl_modulate_entities_changed; - gl_doublelight_entities = Cvar_Get( "gl_doublelight_entities", "1", 0 ); - gl_fragment_program = Cvar_Get( "gl_fragment_program", "1", 0 ); - gl_vertex_buffer_object = Cvar_Get( "gl_vertex_buffer_object", "1", CVAR_FILES ); + gl_doublelight_entities = Cvar_Get("gl_doublelight_entities", "1", 0); + gl_fragment_program = Cvar_Get("gl_fragment_program", "1", 0); + gl_vertex_buffer_object = Cvar_Get("gl_vertex_buffer_object", "1", CVAR_FILES); gl_vertex_buffer_object->modified = qtrue; // development variables - gl_znear = Cvar_Get( "gl_znear", "2", CVAR_CHEAT ); - gl_zfar = Cvar_Get( "gl_zfar", "16384", 0 ); - gl_log = Cvar_Get( "gl_log", "0", 0 ); - gl_drawworld = Cvar_Get( "gl_drawworld", "1", CVAR_CHEAT ); - gl_drawentities = Cvar_Get( "gl_drawentities", "1", CVAR_CHEAT ); - gl_drawsky = Cvar_Get( "gl_drawsky", "1", 0 ); - gl_showtris = Cvar_Get( "gl_showtris", "0", CVAR_CHEAT ); - gl_showorigins = Cvar_Get( "gl_showorigins", "0", CVAR_CHEAT ); - gl_showtearing = Cvar_Get( "gl_showtearing", "0", 0 ); + gl_znear = Cvar_Get("gl_znear", "2", CVAR_CHEAT); + gl_zfar = Cvar_Get("gl_zfar", "16384", 0); + gl_log = Cvar_Get("gl_log", "0", 0); + gl_drawworld = Cvar_Get("gl_drawworld", "1", CVAR_CHEAT); + gl_drawentities = Cvar_Get("gl_drawentities", "1", CVAR_CHEAT); + gl_drawsky = Cvar_Get("gl_drawsky", "1", 0); + gl_showtris = Cvar_Get("gl_showtris", "0", CVAR_CHEAT); + gl_showorigins = Cvar_Get("gl_showorigins", "0", CVAR_CHEAT); + gl_showtearing = Cvar_Get("gl_showtearing", "0", 0); #ifdef _DEBUG - gl_showstats = Cvar_Get( "gl_showstats", "0", 0 ); - gl_showscrap = Cvar_Get( "gl_showscrap", "0", 0 ); - gl_nobind = Cvar_Get( "gl_nobind", "0", CVAR_CHEAT ); - gl_test = Cvar_Get( "gl_test", "0", 0 ); + gl_showstats = Cvar_Get("gl_showstats", "0", 0); + gl_showscrap = Cvar_Get("gl_showscrap", "0", 0); + gl_nobind = Cvar_Get("gl_nobind", "0", CVAR_CHEAT); + gl_test = Cvar_Get("gl_test", "0", 0); #endif - gl_cull_nodes = Cvar_Get( "gl_cull_nodes", "1", 0 ); - gl_cull_models = Cvar_Get( "gl_cull_models", "1", 0 ); - gl_clear = Cvar_Get( "gl_clear", "0", 0 ); - gl_novis = Cvar_Get( "gl_novis", "0", 0 ); + gl_cull_nodes = Cvar_Get("gl_cull_nodes", "1", 0); + gl_cull_models = Cvar_Get("gl_cull_models", "1", 0); + gl_clear = Cvar_Get("gl_clear", "0", 0); + gl_novis = Cvar_Get("gl_novis", "0", 0); gl_novis->changed = gl_novis_changed; - gl_lockpvs = Cvar_Get( "gl_lockpvs", "0", CVAR_CHEAT ); - gl_lightmap = Cvar_Get( "gl_lightmap", "0", CVAR_CHEAT ); - gl_fullbright = Cvar_Get( "r_fullbright", "0", CVAR_CHEAT ); - gl_polyblend = Cvar_Get( "gl_polyblend", "1", 0 ); - gl_showerrors = Cvar_Get( "gl_showerrors", "1", 0 ); + gl_lockpvs = Cvar_Get("gl_lockpvs", "0", CVAR_CHEAT); + gl_lightmap = Cvar_Get("gl_lightmap", "0", CVAR_CHEAT); + gl_fullbright = Cvar_Get("r_fullbright", "0", CVAR_CHEAT); + gl_polyblend = Cvar_Get("gl_polyblend", "1", 0); + gl_showerrors = Cvar_Get("gl_showerrors", "1", 0); - gl_modulate_entities_changed( gl_modulate_entities ); + gl_modulate_entities_changed(gl_modulate_entities); - Cmd_AddCommand( "strings", GL_Strings_f ); - Cmd_AddMacro( "gl_viewcluster", GL_ViewCluster_m ); + Cmd_AddCommand("strings", GL_Strings_f); + Cmd_AddMacro("gl_viewcluster", GL_ViewCluster_m); } -static void GL_Unregister( void ) { - Cmd_RemoveCommand( "strings" ); +static void GL_Unregister(void) +{ + Cmd_RemoveCommand("strings"); } -static qboolean GL_SetupExtensions( void ) { +static qboolean GL_SetupExtensions(void) +{ int integer; float value; - if( !gl_config.extensionsString || !gl_config.extensionsString[0] ) { - Com_EPrintf( "No OpenGL extensions found, check your drivers\n" ); + if (!gl_config.extensionsString || !gl_config.extensionsString[0]) { + Com_EPrintf("No OpenGL extensions found, check your drivers\n"); return qfalse; } // parse extension string - gl_config.ext_supported = QGL_ParseExtensionString( gl_config.extensionsString ); + gl_config.ext_supported = QGL_ParseExtensionString(gl_config.extensionsString); gl_config.ext_enabled = 0; // initialize our 'always on' extensions - if( gl_config.ext_supported & QGL_EXT_compiled_vertex_array ) { - Com_Printf( "...enabling GL_EXT_compiled_vertex_array\n" ); + if (gl_config.ext_supported & QGL_EXT_compiled_vertex_array) { + Com_Printf("...enabling GL_EXT_compiled_vertex_array\n"); gl_config.ext_enabled |= QGL_EXT_compiled_vertex_array; } else { - Com_Printf( "GL_EXT_compiled_vertex_array not found\n" ); + Com_Printf("GL_EXT_compiled_vertex_array not found\n"); } - + gl_config.numTextureUnits = 1; - if( gl_config.ext_supported & QGL_ARB_multitexture ) { - qglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &integer ); - if( integer >= 2 ) { - Com_Printf( "...enabling GL_ARB_multitexture (%d TMUs)\n", integer ); + if (gl_config.ext_supported & QGL_ARB_multitexture) { + qglGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &integer); + if (integer >= 2) { + Com_Printf("...enabling GL_ARB_multitexture (%d TMUs)\n", integer); gl_config.ext_enabled |= QGL_ARB_multitexture; - if( integer > MAX_TMUS ) { + if (integer > MAX_TMUS) { integer = MAX_TMUS; } gl_config.numTextureUnits = integer; } else { - Com_Printf( "...ignoring GL_ARB_multitexture,\n" - "%d TMU is not enough\n", integer ); + Com_Printf("...ignoring GL_ARB_multitexture,\n" + "%d TMU is not enough\n", integer); } } else { - Com_Printf( "GL_ARB_multitexture not found\n" ); + Com_Printf("GL_ARB_multitexture not found\n"); } gl_config.maxAnisotropy = 1; - if( gl_config.ext_supported & QGL_EXT_texture_filter_anisotropic ) { - qglGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &value ); - if( value >= 2 ) { - Com_Printf( "...enabling GL_EXT_texture_filter_anisotropic (%d max)\n", ( int )value ); + if (gl_config.ext_supported & QGL_EXT_texture_filter_anisotropic) { + qglGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &value); + if (value >= 2) { + Com_Printf("...enabling GL_EXT_texture_filter_anisotropic (%d max)\n", (int)value); gl_config.ext_enabled |= QGL_EXT_texture_filter_anisotropic; gl_config.maxAnisotropy = value; } else { - Com_Printf( "...ignoring GL_EXT_texture_filter_anisotropic,\n" - "%d anisotropy is not enough\n", ( int )value ); + Com_Printf("...ignoring GL_EXT_texture_filter_anisotropic,\n" + "%d anisotropy is not enough\n", (int)value); } } else { - Com_Printf( "GL_EXT_texture_filter_anisotropic not found\n" ); + Com_Printf("GL_EXT_texture_filter_anisotropic not found\n"); } - QGL_InitExtensions( gl_config.ext_enabled ); + QGL_InitExtensions(gl_config.ext_enabled); // lack of multitexture support is a show stopper - if( !qglActiveTextureARB ) { - Com_EPrintf( "Required OpenGL extensions are missing\n" ); + if (!qglActiveTextureARB) { + Com_EPrintf("Required OpenGL extensions are missing\n"); return qfalse; } - qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &integer ); - if( integer < 256 ) { - Com_EPrintf( "OpenGL reports invalid maximum texture size\n" ); + qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &integer); + if (integer < 256) { + Com_EPrintf("OpenGL reports invalid maximum texture size\n"); return qfalse; } - if( integer & ( integer - 1 ) ) { - integer = npot32( integer ) >> 1; + if (integer & (integer - 1)) { + integer = npot32(integer) >> 1; } - if( integer > MAX_TEXTURE_SIZE ) { + if (integer > MAX_TEXTURE_SIZE) { integer = MAX_TEXTURE_SIZE; } @@ -811,57 +834,60 @@ static qboolean GL_SetupExtensions( void ) { return qtrue; } -static void GL_IdentifyRenderer( void ) { +static void GL_IdentifyRenderer(void) +{ char *p; // parse renderer - if( Q_stristr( gl_config.rendererString, "mesa dri" ) ) { + if (Q_stristr(gl_config.rendererString, "mesa dri")) { gl_config.renderer = GL_RENDERER_MESADRI; } else { gl_config.renderer = GL_RENDERER_OTHER; } // parse version - gl_config.version_major = strtoul( gl_config.versionString, &p, 10 ); - if( *p == '.' ) { - gl_config.version_minor = strtoul( p + 1, NULL, 10 ); + gl_config.version_major = strtoul(gl_config.versionString, &p, 10); + if (*p == '.') { + gl_config.version_minor = strtoul(p + 1, NULL, 10); } } -static void GL_InitTables( void ) { +static void GL_InitTables(void) +{ vec_t lat, lng; const vec_t *v; int i; - for( i = 0; i < NUMVERTEXNORMALS; i++ ) { + for (i = 0; i < NUMVERTEXNORMALS; i++) { v = bytedirs[i]; - lat = acos( v[2] ); - lng = atan2( v[1], v[0] ); - gl_static.latlngtab[i][0] = lat * (255.0f/(2*M_PI)); - gl_static.latlngtab[i][1] = lng * (255.0f/(2*M_PI)); + lat = acos(v[2]); + lng = atan2(v[1], v[0]); + gl_static.latlngtab[i][0] = lat * (255.0f / (2 * M_PI)); + gl_static.latlngtab[i][1] = lng * (255.0f / (2 * M_PI)); } - for( i = 0; i < 256; i++ ) { - gl_static.sintab[i] = sin( i * (2*M_PI/255.0f) ); + for (i = 0; i < 256; i++) { + gl_static.sintab[i] = sin(i * (2 * M_PI / 255.0f)); } } -static void GL_PostInit( void ) { +static void GL_PostInit(void) +{ registration_sequence = 1; - if( gl_vertex_buffer_object->modified ) { + if (gl_vertex_buffer_object->modified) { // enable buffer objects before map is loaded - if( gl_config.ext_supported & QGL_ARB_vertex_buffer_object ) { - if( gl_vertex_buffer_object->integer ) { - Com_Printf( "...enabling GL_ARB_vertex_buffer_object\n" ); - QGL_InitExtensions( QGL_ARB_vertex_buffer_object ); + if (gl_config.ext_supported & QGL_ARB_vertex_buffer_object) { + if (gl_vertex_buffer_object->integer) { + Com_Printf("...enabling GL_ARB_vertex_buffer_object\n"); + QGL_InitExtensions(QGL_ARB_vertex_buffer_object); gl_config.ext_enabled |= QGL_ARB_vertex_buffer_object; } else { - Com_Printf( "...ignoring GL_ARB_vertex_buffer_object\n" ); + Com_Printf("...ignoring GL_ARB_vertex_buffer_object\n"); } - } else if( gl_vertex_buffer_object->integer ) { - Com_Printf( "GL_ARB_vertex_buffer_object not found\n" ); - Cvar_Set( "gl_vertex_buffer_object", "0" ); + } else if (gl_vertex_buffer_object->integer) { + Com_Printf("GL_ARB_vertex_buffer_object not found\n"); + Cvar_Set("gl_vertex_buffer_object", "0"); } // reset the modified flag @@ -873,27 +899,28 @@ static void GL_PostInit( void ) { GL_SetDefaultState(); } -// ============================================================================== +// ============================================================================== /* =============== R_Init =============== */ -qboolean R_Init( qboolean total ) { - Com_DPrintf( "GL_Init( %i )\n", total ); +qboolean R_Init(qboolean total) +{ + Com_DPrintf("GL_Init( %i )\n", total); - if( !total ) { + if (!total) { GL_PostInit(); return qtrue; } - Com_Printf( "------- R_Init -------\n" ); - Com_DPrintf( "ref_gl " VERSION ", " __DATE__ "\n" ); + Com_Printf("------- R_Init -------\n"); + Com_DPrintf("ref_gl " VERSION ", " __DATE__ "\n"); // initialize OS-specific parts of OpenGL // create the window and set up the context - if( !VID_Init() ) { + if (!VID_Init()) { return qfalse; } @@ -901,24 +928,25 @@ qboolean R_Init( qboolean total ) { QGL_Init(); // get various static strings from OpenGL -#define GET_STRING( x ) ( const char * )qglGetString( x ) - gl_config.vendorString = GET_STRING( GL_VENDOR ); - gl_config.rendererString = GET_STRING( GL_RENDERER ); - gl_config.versionString = GET_STRING( GL_VERSION ); - gl_config.extensionsString = GET_STRING( GL_EXTENSIONS ); +#define GET_STRING(x) (const char *)qglGetString(x) + + gl_config.vendorString = GET_STRING(GL_VENDOR); + gl_config.rendererString = GET_STRING(GL_RENDERER); + gl_config.versionString = GET_STRING(GL_VERSION); + gl_config.extensionsString = GET_STRING(GL_EXTENSIONS); // parse renderer/version strings GL_IdentifyRenderer(); // parse extension string - if( !GL_SetupExtensions() ) { + if (!GL_SetupExtensions()) { goto fail; } // register our variables GL_Register(); - QGL_EnableLogging( gl_log->integer ); + QGL_EnableLogging(gl_log->integer); gl_log->modified = qfalse; GL_PostInit(); @@ -928,16 +956,16 @@ qboolean R_Init( qboolean total ) { GL_InitTables(); - if( (( size_t )tess.vertices) & 15 ) { - Com_WPrintf( "tess.vertices not 16 byte aligned\n" ); + if (((size_t)tess.vertices) & 15) { + Com_WPrintf("tess.vertices not 16 byte aligned\n"); } - Com_Printf( "----------------------\n" ); + Com_Printf("----------------------\n"); return qtrue; fail: - memset( &gl_config, 0, sizeof( gl_config ) ); + memset(&gl_config, 0, sizeof(gl_config)); QGL_Shutdown(); VID_Shutdown(); return qfalse; @@ -948,23 +976,24 @@ fail: R_Shutdown =============== */ -void R_Shutdown( qboolean total ) { - Com_DPrintf( "GL_Shutdown( %i )\n", total ); +void R_Shutdown(qboolean total) +{ + Com_DPrintf("GL_Shutdown( %i )\n", total); GL_FreeWorld(); GL_ShutdownImages(); MOD_Shutdown(); - if( gl_vertex_buffer_object->modified ) { + if (gl_vertex_buffer_object->modified) { // disable buffer objects after map is freed - QGL_ShutdownExtensions( QGL_ARB_vertex_buffer_object ); + QGL_ShutdownExtensions(QGL_ARB_vertex_buffer_object); gl_config.ext_enabled &= ~QGL_ARB_vertex_buffer_object; } - if( !total ) { + if (!total) { return; } - + GL_ShutdownPrograms(); // shut down OS specific OpenGL stuff like contexts, etc. @@ -975,8 +1004,8 @@ void R_Shutdown( qboolean total ) { GL_Unregister(); - memset( &gl_static, 0, sizeof( gl_static ) ); - memset( &gl_config, 0, sizeof( gl_config ) ); + memset(&gl_static, 0, sizeof(gl_static)); + memset(&gl_config, 0, sizeof(gl_config)); } /* @@ -984,17 +1013,18 @@ void R_Shutdown( qboolean total ) { R_BeginRegistration =============== */ -void R_BeginRegistration( const char *name ) { +void R_BeginRegistration(const char *name) +{ char fullname[MAX_QPATH]; gl_static.registering = qtrue; registration_sequence++; - memset( &glr, 0, sizeof( glr ) ); + memset(&glr, 0, sizeof(glr)); glr.viewcluster1 = glr.viewcluster2 = -2; - - Q_concat( fullname, sizeof( fullname ), "maps/", name, ".bsp", NULL ); - GL_LoadWorld( fullname ); + + Q_concat(fullname, sizeof(fullname), "maps/", name, ".bsp", NULL); + GL_LoadWorld(fullname); } /* @@ -1002,7 +1032,8 @@ void R_BeginRegistration( const char *name ) { R_EndRegistration =============== */ -void R_EndRegistration( void ) { +void R_EndRegistration(void) +{ IMG_FreeUnused(); MOD_FreeUnused(); Scrap_Upload(); @@ -1014,7 +1045,8 @@ void R_EndRegistration( void ) { R_ModeChanged =============== */ -void R_ModeChanged( int width, int height, int flags, int rowbytes, void *pixels ) { +void R_ModeChanged(int width, int height, int flags, int rowbytes, void *pixels) +{ r_config.width = width & ~7; r_config.height = height & ~1; r_config.flags = flags; |