Track framebuffer target in emissive capture

Fixes corrupt bloom layer in mixed-target scene with translucency
vram-guild · Oct 31, 2020 · 956eb94 · 956eb94
1 parent 434f416
commit 956eb94
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/grondag/canvas/material/state/RenderState.java b/src/main/java/grondag/canvas/material/state/RenderState.java
@@ -60,11 +60,16 @@ public void enable() {
 			return;
 		}
 
-		target.enable();
-
 		if (active == null) {
 			// same for all, so only do 1X
 			RenderSystem.shadeModel(GL11.GL_SMOOTH);
+			target.enable();
+			// NB: must be after frame-buffer target switch
+			if (Configurator.enableBloom) CanvasFrameBufferHacks.startEmissiveCapture();
+		} else if (active.target != target) {
+			if (Configurator.enableBloom) CanvasFrameBufferHacks.endEmissiveCapture();
+			target.enable();
+			if (Configurator.enableBloom) CanvasFrameBufferHacks.startEmissiveCapture();
 		}
 
 		active = this;
@@ -76,9 +81,6 @@ public void enable() {
 		fog.enable();
 		decal.enable();
 
-		// NB: must be after frame-buffer target switch
-		if (Configurator.enableBloom) CanvasFrameBufferHacks.startEmissiveCapture();
-
 		CULL_STATE.setEnabled(cull);
 		LIGHTMAP_STATE.setEnabled(enableLightmap);
 		LINE_STATE.setEnabled(lines);