Fix MSAA with depth-fade and global fog

Author: VReaperV

src/engine/renderer/tr_backend.cpp

@@ -1622,8 +1622,6 @@ void RB_RenderSSAO()
 
 	RB_PrepareForSamplingDepthMap();
 
-	TransitionMSAAToMain( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
 	GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO );
 	GL_Cull( cullType_t::CT_TWO_SIDED );
 
@@ -1655,8 +1653,6 @@ void RB_RenderSSAO()
 
 	Tess_InstantScreenSpaceQuad();
 
-	TransitionMainToMSAA( GL_COLOR_BUFFER_BIT );
-
 	GL_CheckErrors();
 }
 
@@ -2800,11 +2796,16 @@ static void RB_RenderView( bool depthPass )
 		RB_RenderDrawSurfaces( shaderSort_t::SS_ENVIRONMENT_FOG, shaderSort_t::SS_OPAQUE, DRAWSURFACES_ALL );
 	}
 
+	// Here so we don't do an extra MSAA resolve if both SSAO and global fog are present
+	TransitionMSAAToMain( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
 	RB_RenderSSAO();
 
 	// render global fog post process effect
 	RB_RenderGlobalFog();
 
+	TransitionMainToMSAA( GL_COLOR_BUFFER_BIT );
+
 	// draw everything that is translucent
 	if ( glConfig.usingMaterialSystem ) {
 		materialSystem.RenderMaterials( shaderSort_t::SS_ENVIRONMENT_NOFOG, shaderSort_t::SS_POST_PROCESS, backEnd.viewParms.viewID );

src/engine/renderer/tr_shade.cpp

@@ -900,10 +900,7 @@ void Render_generic3D( shaderStage_t *pStage )
 	{
 		RB_PrepareForSamplingDepthMap();
 
-		if ( glConfig.MSAA && backEnd.dirtyDepthBuffer ) {
-			TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );
-			R_BindFBO( GL_DRAW_FRAMEBUFFER, tr.msaaFBO );
-		}
+		TransitionMSAAToMain( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 	}
 
 	// choose right shader program ----------------------------------
@@ -992,6 +989,10 @@ void Render_generic3D( shaderStage_t *pStage )
 
 	Tess_DrawElements();
 
+	if ( needDepthMap ) {
+		TransitionMainToMSAA( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+	}
+
 	GL_CheckErrors();
 }