Backport DH support from Iris 1.6.11 into Oculus (Use PixelBuilder sh…

…adow fix for DH)

build.gradle

@@ -17,7 +17,8 @@ loom {
 				"mixins.oculus.optimized-stitching.json",
 				"oculus-batched-entity-rendering.mixins.json",
 				"mixins.oculus.compat.sodium.json",
-				"mixins.oculus.compat.json"
+				"mixins.oculus.compat.json",
+				"mixins.iris.compat.dh.json"
 		]
 	}
 	mixin.defaultRefmapName = "oculus-mixins-refmap.json"
@@ -59,6 +60,8 @@ dependencies {
 
 	modRuntimeOnly "curse.maven:lazydfu-460819:3249059"
 
+	implementation "maven.modrinth:distanthorizons:2.0.1-a-1.16.5"
+
 	implementation(shadow(project(path: ":glsl-relocated", configuration: "bundledJar"))) {
 		transitive = false
 	}

src/main/java/net/coderbot/iris/compat/dh/DHCompat.java

@@ -0,0 +1,15 @@
+package net.coderbot.iris.compat.dh;
+
+import net.coderbot.iris.gl.framebuffer.GlFramebuffer;
+
+public class DHCompat {
+	private GlFramebuffer fb;
+
+	public int getFramebuffer() {
+		return fb.getId();
+	}
+
+	public void setFramebuffer(GlFramebuffer fb) {
+		this.fb = fb;
+	}
+}

src/main/java/net/coderbot/iris/compat/dh/mixin/IrisDHCompatMixinPlugin.java

@@ -0,0 +1,51 @@
+package net.coderbot.iris.compat.dh.mixin;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import net.minecraftforge.fml.loading.FMLLoader;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Non-critical mixin config plugin, just disables mixins if Distant Horizons isn't present,
+ * since otherwise the log gets spammed with warnings.
+ */
+public class IrisDHCompatMixinPlugin implements IMixinConfigPlugin {
+	@Override
+	public void onLoad(String mixinPackage) {
+
+	}
+
+	@Override
+	public String getRefMapperConfig() {
+		return null;
+	}
+
+	@Override
+	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+		return FMLLoader.getLoadingModList().getModFileById("distanthorizons") != null;
+	}
+
+	@Override
+	public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+	}
+
+	@Override
+	public List<String> getMixins() {
+		return null;
+	}
+
+	@Override
+	public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+	}
+
+	@Override
+	public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+	}
+}

src/main/java/net/coderbot/iris/compat/dh/mixin/MixinDHApplyShader.java

@@ -0,0 +1,22 @@
+package net.coderbot.iris.compat.dh.mixin;
+
+import com.seibel.distanthorizons.core.render.renderer.shaders.DhApplyShader;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import net.coderbot.iris.Iris;
+import net.coderbot.iris.pipeline.WorldRenderingPipeline;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(value = DhApplyShader.class, remap = false)
+public class MixinDHApplyShader {
+	@Redirect(method = "onRender", at = @At(value = "INVOKE", target = "Lcom/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper;getTargetFrameBuffer()I"))
+	private int changeFB(IMinecraftRenderWrapper instance) {
+		WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
+		if (pipeline.getDHCompat() != null) {
+			return pipeline.getDHCompat().getFramebuffer();
+		} else {
+			return instance.getTargetFrameBuffer();
+		}
+	}
+}

src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java

@@ -11,7 +11,7 @@
 import java.util.Set;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
-
+import net.coderbot.iris.compat.dh.DHCompat;
 import net.coderbot.iris.colorspace.ColorSpace;
 import net.coderbot.iris.colorspace.ColorSpaceComputeConverter;
 import net.coderbot.iris.colorspace.ColorSpaceConverter;
@@ -164,6 +164,8 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
 	private PackDirectives packDirectives;
 	private ColorSpace currentColorSpace;
 
+	private DHCompat dhCompat;
+
 	public DeferredWorldRenderingPipeline(ProgramSet programs) {
 		Objects.requireNonNull(programs);
 
@@ -179,6 +181,8 @@ public DeferredWorldRenderingPipeline(ProgramSet programs) {
 		this.oldLighting = programs.getPackDirectives().isOldLighting();
 		this.updateNotifier = new FrameUpdateNotifier();
 
+		this.dhCompat = new DHCompat();
+
 		this.packDirectives = programs.getPackDirectives();
 
 		RenderTarget mainTarget = Minecraft.getInstance().getMainRenderTarget();
@@ -436,6 +440,8 @@ public DeferredWorldRenderingPipeline(ProgramSet programs) {
 			return builder.build();
 		};
 
+		dhCompat.setFramebuffer(renderTargets.createGbufferFramebuffer(ImmutableSet.of(), new int[] { 0 }));
+
 		this.sodiumTerrainPipeline = new SodiumTerrainPipeline(this, programs, createTerrainSamplers,
 			shadowRenderer == null ? null : createShadowTerrainSamplers, createTerrainImages,
 			shadowRenderer == null ? null : createShadowTerrainImages);
@@ -531,6 +537,11 @@ public float getSunPathRotation() {
 		return sunPathRotation;
 	}
 
+	@Override
+	public DHCompat getDHCompat() {
+		return dhCompat;
+	}
+
 	private RenderCondition getCondition(WorldRenderingPhase phase) {
 		if (isRenderingShadow) {
 			return RenderCondition.SHADOW;

src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java

@@ -4,7 +4,7 @@
 import java.util.OptionalInt;
 
 import com.mojang.blaze3d.platform.GlStateManager;
-
+import net.coderbot.iris.compat.dh.DHCompat;
 import net.coderbot.iris.block_rendering.BlockRenderingSettings;
 import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
 import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
@@ -193,4 +193,9 @@ public float getSunPathRotation() {
 		// No sun tilt
 		return 0;
 	}
+
+	@Override
+	public DHCompat getDHCompat() {
+		return null;
+	}
 }

src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 import java.util.OptionalInt;
-
+import net.coderbot.iris.compat.dh.DHCompat;
 import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
 import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
 import net.coderbot.iris.gbuffer_overrides.state.RenderTargetStateListener;
@@ -54,4 +54,6 @@ public interface WorldRenderingPipeline {
 	boolean allowConcurrentCompute();
 
 	float getSunPathRotation();
+
+	DHCompat getDHCompat();
 }

src/main/resources/mixins.iris.compat.dh.json

@@ -0,0 +1,13 @@
+{
+    "required": true,
+    "minVersion": "0.8",
+    "plugin": "net.coderbot.iris.compat.dh.mixin.IrisDHCompatMixinPlugin",
+    "package": "net.coderbot.iris.compat.dh.mixin",
+    "compatibilityLevel": "JAVA_8",
+    "client": [
+      "MixinDHApplyShader"
+    ],
+    "injectors": {
+      "defaultRequire": 1
+    }
+  }