From ff3a57ae8a2a446664173314b6e89de4713a4e1b Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 13 Apr 2026 13:15:04 +0500 Subject: [PATCH] ref: gl: drop legacy mirror viewpass code --- ref/gl/gl_local.h | 9 +++------ ref/gl/gl_rmain.c | 35 +++++++---------------------------- ref/gl/gl_rsurf.c | 2 +- ref/gl/gl_sprite.c | 2 +- 4 files changed, 12 insertions(+), 36 deletions(-) diff --git a/ref/gl/gl_local.h b/ref/gl/gl_local.h index b4ac9294..4b8cb8a1 100644 --- a/ref/gl/gl_local.h +++ b/ref/gl/gl_local.h @@ -71,16 +71,13 @@ void VGL_ShimEndFrame( void ); #define DEFAULT_ALPHATEST 0.0f // refparams -#define RP_NONE 0 -#define RP_ENVVIEW BIT( 0 ) // used for cubemapshot -#define RP_OLDVIEWLEAF BIT( 1 ) -#define RP_CLIPPLANE BIT( 2 ) +#define RP_NONE 0 +#define RP_ENVVIEW BIT( 0 ) // used for cubemapshot -#define RP_NONVIEWERREF (RP_ENVVIEW) #define R_ModelOpaque( rm ) ( rm == kRenderNormal ) #define R_StaticEntity( ent ) ( VectorIsNull( ent->origin ) && VectorIsNull( ent->angles )) #define RP_LOCALCLIENT( e ) ((e) != NULL && (e)->index == ( gp_cl->playernum + 1 ) && e->player ) -#define RP_NORMALPASS() ( FBitSet( RI.params, RP_NONVIEWERREF ) == 0 ) +#define RP_NORMALPASS() ( FBitSet( RI.params, RP_ENVVIEW ) == 0 ) #define CL_IsViewEntityLocalPlayer() ( gp_cl->viewentity == ( gp_cl->playernum + 1 )) diff --git a/ref/gl/gl_rmain.c b/ref/gl/gl_rmain.c index 8572e369..b5eb6e99 100644 --- a/ref/gl/gl_rmain.c +++ b/ref/gl/gl_rmain.c @@ -583,20 +583,6 @@ void R_SetupGL( qboolean set_gl_state ) pglMatrixMode( GL_MODELVIEW ); GL_LoadMatrix( RI.worldviewMatrix ); - if( FBitSet( RI.params, RP_CLIPPLANE )) - { - GLdouble clip[4]; - mplane_t *p = &RI.clipPlane; - - clip[0] = p->normal[0]; - clip[1] = p->normal[1]; - clip[2] = p->normal[2]; - clip[3] = -p->dist; - - pglClipPlane( GL_CLIP_PLANE0, clip ); - pglEnable( GL_CLIP_PLANE0 ); - } - GL_Cull( GL_FRONT ); pglDisable( GL_BLEND ); @@ -604,17 +590,6 @@ void R_SetupGL( qboolean set_gl_state ) pglColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); } -/* -============= -R_EndGL -============= -*/ -static void R_EndGL( void ) -{ - if( RI.params & RP_CLIPPLANE ) - pglDisable( GL_CLIP_PLANE0 ); -} - /* ============= R_RecursiveFindWaterTexture @@ -1019,8 +994,6 @@ void R_RenderScene( void ) R_DrawEntitiesOnList(); R_DrawWaterSurfaces(); - - R_EndGL(); } void R_GammaChanged( qboolean do_reset_gamma ) @@ -1115,8 +1088,14 @@ void R_SetupRefParams( const ref_viewpass_t *rvp ) RI.farClip = 0; if( !FBitSet( rvp->flags, RF_DRAW_CUBEMAP )) + { RI.drawOrtho = FBitSet( rvp->flags, RF_DRAW_OVERVIEW ); - else RI.drawOrtho = false; + } + else + { + SetBits( RI.params, RP_ENVVIEW ); + RI.drawOrtho = false; + } // setup viewport RI.viewport[0] = rvp->viewport[0]; diff --git a/ref/gl/gl_rsurf.c b/ref/gl/gl_rsurf.c index 67d6d6ad..5d9247dc 100644 --- a/ref/gl/gl_rsurf.c +++ b/ref/gl/gl_rsurf.c @@ -3787,7 +3787,7 @@ void R_MarkLeaves( void ) if( r_novis.value || RI.drawOrtho || !RI.viewleaf || !WORLDMODEL->visdata ) novis = true; - gEngfuncs.R_FatPVS( RI.pvsorigin, r_pvs_radius->value, RI.visbytes, FBitSet( RI.params, RP_OLDVIEWLEAF ), novis ); + gEngfuncs.R_FatPVS( RI.pvsorigin, r_pvs_radius->value, RI.visbytes, false, novis ); if( force && !novis ) gEngfuncs.R_FatPVS( test, r_pvs_radius->value, RI.visbytes, true, novis ); diff --git a/ref/gl/gl_sprite.c b/ref/gl/gl_sprite.c index 48b51767..ecb2a6c2 100644 --- a/ref/gl/gl_sprite.c +++ b/ref/gl/gl_sprite.c @@ -386,7 +386,7 @@ void R_DrawSpriteModel( cl_entity_t *e ) vec3_t v_forward, v_right, v_up; vec3_t origin, color, color2 = { 0.0f }; - if( RI.params & RP_ENVVIEW ) + if( FBitSet( RI.params, RP_ENVVIEW )) return; model = e->model;