From 74b196d2c362ea195967be6f139faeed18795a53 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Sun, 17 Aug 2025 23:43:33 +0500
Subject: [PATCH] ref: gl: do not apply multisampling when drawing 2D

---
 ref/gl/gl_draw.c  | 10 ++++++++++
 ref/gl/gl_rmain.c |  8 --------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ref/gl/gl_draw.c b/ref/gl/gl_draw.c
index d4a85dbe..71d5fdc7 100644
--- a/ref/gl/gl_draw.c
+++ b/ref/gl/gl_draw.c
@@ -227,6 +227,9 @@ void R_Set2DMode( qboolean enable )
 		pglEnable( GL_ALPHA_TEST );
 		pglColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
 
+		if( glConfig.max_multisamples > 1 && gl_msaa.value )
+			pglDisable( GL_MULTISAMPLE_ARB );
+
 		glState.in2DMode = true;
 		RI.currententity = NULL;
 		RI.currentmodel = NULL;
@@ -243,6 +246,13 @@ void R_Set2DMode( qboolean enable )
 		pglMatrixMode( GL_MODELVIEW );
 		GL_LoadMatrix( RI.worldviewMatrix );
 
+		if( glConfig.max_multisamples > 1 )
+		{
+			if( gl_msaa.value )
+				pglEnable( GL_MULTISAMPLE_ARB );
+			else pglDisable( GL_MULTISAMPLE_ARB );
+		}
+
 		GL_Cull( GL_FRONT );
 	}
 }
diff --git a/ref/gl/gl_rmain.c b/ref/gl/gl_rmain.c
index d05887d3..ec584130 100644
--- a/ref/gl/gl_rmain.c
+++ b/ref/gl/gl_rmain.c
@@ -1124,14 +1124,6 @@ void R_RenderFrame( const ref_viewpass_t *rvp )
 	if( gl_finish.value && RI.drawWorld )
 		pglFinish();
 
-	if( glConfig.max_multisamples > 1 && FBitSet( gl_msaa.flags, FCVAR_CHANGED ))
-	{
-		if( gl_msaa.value )
-			pglEnable( GL_MULTISAMPLE_ARB );
-		else pglDisable( GL_MULTISAMPLE_ARB );
-		ClearBits( gl_msaa.flags, FCVAR_CHANGED );
-	}
-
 	// completely override rendering
 	if( gEngfuncs.drawFuncs->GL_RenderFrame != NULL )
 	{