Clean-up Render_generic3D() MSAA resolve

VReaperV · VReaperV · commit 2cdcc8947c79 · 2026-01-09T04:38:41.000+03:00
diff --git a/src/engine/renderer/tr_shade.cpp b/src/engine/renderer/tr_shade.cpp
@@ -891,17 +891,12 @@ void Render_generic3D( shaderStage_t *pStage )
 	bool hasDepthFade = pStage->hasDepthFade;
 	bool needDepthMap = pStage->hasDepthFade;
 
-	const bool needMSAATransion = needDepthMap && backEnd.dirtyDepthBuffer;
-
-	if ( needDepthMap && backEnd.dirtyDepthBuffer && glConfig.textureBarrierAvailable )
+	if ( needDepthMap )
 	{
 		RB_PrepareForSamplingDepthMap();
-	}
-
-	if ( needMSAATransion ) {
-		TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );
 
-		if ( glConfig.MSAA ) {
+		if ( glConfig.MSAA && backEnd.dirtyDepthBuffer ) {
+			TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );
 			R_BindFBO( GL_DRAW_FRAMEBUFFER, tr.msaaFBO );
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -891,17 +891,12 @@ void Render_generic3D( shaderStage_t *pStage )`
`891`	`891`	`bool hasDepthFade = pStage->hasDepthFade;`
`892`	`892`	`bool needDepthMap = pStage->hasDepthFade;`
`893`	`893`
`894`		`- const bool needMSAATransion = needDepthMap && backEnd.dirtyDepthBuffer;`
`895`		`-`
`896`		`- if ( needDepthMap && backEnd.dirtyDepthBuffer && glConfig.textureBarrierAvailable )`
	`894`	`+ if ( needDepthMap )`
`897`	`895`	`{`
`898`	`896`	`RB_PrepareForSamplingDepthMap();`
`899`		`- }`
`900`		`-`
`901`		`- if ( needMSAATransion ) {`
`902`		`- TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );`
`903`	`897`
`904`		`- if ( glConfig.MSAA ) {`
	`898`	`+ if ( glConfig.MSAA && backEnd.dirtyDepthBuffer ) {`
	`899`	`+ TransitionMSAAToMain( GL_DEPTH_BUFFER_BIT );`
`905`	`900`	`R_BindFBO( GL_DRAW_FRAMEBUFFER, tr.msaaFBO );`
`906`	`901`	`}`
`907`	`902`	`}`