MSAA clean-up and fixes

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -1062,7 +1062,7 @@ void BindShaderHeatHaze( Material* material ) {
 	gl_heatHazeShaderMaterial->SetUniform_DeformEnable( true );
 
 	// draw to background image
-	TransitionMSAAToMain();
+	TransitionMSAAToMain( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 
 	R_BindFBO( tr.mainFBO[1 - backEnd.currentMainFBO] );
 }
@@ -2240,7 +2240,7 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
 
 		RenderIndirect( material, viewID );
 
-		TransitionMainToMSAA();
+		TransitionMainToMSAA( GL_COLOR_BUFFER_BIT );
 	}
 
 	if ( r_showTris->integer

src/engine/renderer/tr_backend.cpp

@@ -199,42 +199,36 @@ GLuint64 GL_BindToTMU( int unit, image_t *image )
 	return 0;
 }
 
-static void BlitFBOToMSAA( FBO_t* fbo ) {
-	glState.currentFBO = nullptr;
-
+static void BlitFBOToMSAA( FBO_t* fbo, const GLbitfield mask ) {
 	R_BindFBO( GL_READ_FRAMEBUFFER, fbo );
 	R_BindFBO( GL_DRAW_FRAMEBUFFER, tr.msaaFBO );
 	glBlitFramebuffer( 0, 0, fbo->width, fbo->height, 0, 0, tr.msaaFBO->width, tr.msaaFBO->height,
-		GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST );
+		mask, GL_NEAREST );
 
-	glState.currentFBO = nullptr;
 	R_BindFBO( GL_DRAW_FRAMEBUFFER, fbo );
 	glState.currentFBO = fbo;
 }
 
-static void BlitMSAAToFBO( FBO_t* fbo ) {
-	glState.currentFBO = nullptr;
-
+static void BlitMSAAToFBO( FBO_t* fbo, const GLbitfield mask ) {
 	R_BindFBO( GL_READ_FRAMEBUFFER, tr.msaaFBO );
 	R_BindFBO( GL_DRAW_FRAMEBUFFER, fbo );
 	glBlitFramebuffer( 0, 0, tr.msaaFBO->width, tr.msaaFBO->height, 0, 0, fbo->width, fbo->height,
-		GL_COLOR_BUFFER_BIT /* | GL_DEPTH_BUFFER_BIT */, GL_NEAREST );
+		mask, GL_NEAREST );
 
-	glState.currentFBO = nullptr;
 	R_BindFBO( GL_READ_FRAMEBUFFER, fbo );
 	glState.currentFBO = fbo;
 }
 
-void TransitionMainToMSAA() {
+void TransitionMainToMSAA( const GLbitfield mask ) {
 	if ( glConfig.MSAA ) {
-		BlitFBOToMSAA( tr.mainFBO[backEnd.currentMainFBO] );
+		BlitFBOToMSAA( tr.mainFBO[backEnd.currentMainFBO], mask );
 		R_BindFBO( tr.msaaFBO );
 	}
 }
 
-void TransitionMSAAToMain() {
+void TransitionMSAAToMain( const GLbitfield mask ) {
 	if ( glConfig.MSAA ) {
-		BlitMSAAToFBO( tr.mainFBO[backEnd.currentMainFBO] );
+		BlitMSAAToFBO( tr.mainFBO[backEnd.currentMainFBO], mask );
 	}
 }
 
@@ -1309,6 +1303,8 @@ static void RenderDepthTiles()
 	{
 		RB_PrepareForSamplingDepthMap();
 	}
+	
+	TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );
 
 	// 1st step
 	R_BindFBO( tr.depthtile1FBO );
@@ -1500,7 +1496,7 @@ void RB_RenderBloom()
 			GL_BindToTMU( 0, tr.currentRenderImage[backEnd.currentMainFBO] )
 		);
 
-		TransitionMSAAToMain();
+		TransitionMSAAToMain( GL_COLOR_BUFFER_BIT );
 
 		R_BindFBO( tr.contrastRenderFBO );
 		GL_ClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
@@ -1566,7 +1562,7 @@ void RB_RenderBloom()
 		GL_PopMatrix();
 	}
 
-	TransitionMainToMSAA();
+	TransitionMainToMSAA( GL_COLOR_BUFFER_BIT );
 
 	GL_CheckErrors();
 }
@@ -1588,7 +1584,7 @@ void RB_RenderMotionBlur()
 
 	gl_motionblurShader->BindProgram();
 
-	TransitionMSAAToMain();
+	TransitionMSAAToMain( GL_COLOR_BUFFER_BIT );
 
 	// Swap main FBOs
 	gl_motionblurShader->SetUniform_ColorMapBindless(
@@ -1605,7 +1601,7 @@ void RB_RenderMotionBlur()
 
 	Tess_InstantScreenSpaceQuad();
 
-	TransitionMainToMSAA();
+	TransitionMainToMSAA( GL_COLOR_BUFFER_BIT );
 
 	GL_CheckErrors();
 }
@@ -1627,6 +1623,8 @@ void RB_RenderSSAO()
 
 	RB_PrepareForSamplingDepthMap();
 
+	TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );
+
 	GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO );
 	GL_Cull( cullType_t::CT_TWO_SIDED );
 
@@ -2856,7 +2854,7 @@ static void RB_RenderPostProcess()
 		materialSystem.EndFrame();
 	}
 
-	TransitionMSAAToMain();
+	TransitionMSAAToMain( GL_COLOR_BUFFER_BIT );
 
 	RB_FXAA();
 

src/engine/renderer/tr_fbo.cpp

@@ -280,11 +280,8 @@ void R_InitFBOs()
 	if ( glConfig.MSAA ) {
 		tr.msaaFBO = R_CreateFBO( "msaa", width, height );
 		R_BindFBO( tr.msaaFBO );
-		GL_CheckErrors();
 		R_AttachFBOTexture2D( GL_TEXTURE_2D_MULTISAMPLE, tr.currentRenderImageMSAA->texnum, 0 );
-		GL_CheckErrors();
 		R_AttachFBOTexturePackedDepthStencilMSAA( tr.currentDepthImageMSAA->texnum );
-		GL_CheckErrors();
 		R_CheckFBO( tr.msaaFBO );
 	}
 

src/engine/renderer/tr_local.h

@@ -2917,8 +2917,8 @@ inline bool checkGLErrors()
 	GLuint64 GL_BindToTMU( int unit, image_t *image );
 	void GL_BindNullProgram();
 
-	void TransitionMainToMSAA();
-	void TransitionMSAAToMain();
+	void TransitionMainToMSAA( const GLbitfield mask );
+	void TransitionMSAAToMain( const GLbitfield mask );
 	void BindMSAAOrMainFBO();
 
 	void GL_SetDefaultState();

src/engine/renderer/tr_shade.cpp

@@ -891,11 +891,21 @@ void Render_generic3D( shaderStage_t *pStage )
 	bool hasDepthFade = pStage->hasDepthFade;
 	bool needDepthMap = pStage->hasDepthFade;
 
-	if ( needDepthMap )
+	const bool needMSAATransion = needDepthMap && backEnd.dirtyDepthBuffer;
+
+	if ( needDepthMap && backEnd.dirtyDepthBuffer && glConfig.textureBarrierAvailable )
 	{
 		RB_PrepareForSamplingDepthMap();
 	}
 
+	if ( needMSAATransion ) {
+		TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );
+
+		if ( glConfig.MSAA ) {
+			R_BindFBO( GL_DRAW_FRAMEBUFFER, tr.msaaFBO );
+		}
+	}
+
 	// choose right shader program ----------------------------------
 	ProcessShaderGeneric3D( pStage );
 	gl_genericShader->BindProgram();
@@ -1465,7 +1475,7 @@ void Render_heatHaze( shaderStage_t *pStage )
 	}
 
 	// draw to background image
-	TransitionMSAAToMain();
+	TransitionMSAAToMain( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 	R_BindFBO( tr.mainFBO[ 1 - backEnd.currentMainFBO ] );
 
 	// bind u_NormalMap
@@ -1501,7 +1511,7 @@ void Render_heatHaze( shaderStage_t *pStage )
 	gl_heatHazeShader->SetUniform_DeformMagnitude( 0.0f );
 	Tess_DrawElements();
 
-	TransitionMainToMSAA();
+	TransitionMainToMSAA( GL_COLOR_BUFFER_BIT );
 
 	GL_CheckErrors();
 }