Early fixes for Iris

iPortalTeam · Oct 19, 2024 · d29b674 · d29b674
1 parent 7dc633a
commit d29b674
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 121 deletions.
diff --git a/...main/java/qouteall/imm_ptl/core/compat/mixin/iris/MixinIrisNewWorldRenderingPipeline.java b/...main/java/qouteall/imm_ptl/core/compat/mixin/iris/MixinIrisNewWorldRenderingPipeline.java
diff --git a/...ain/java/qouteall/imm_ptl/core/compat/mixin/iris/MixinIrisSodiumChunkShaderInterface.java b/...ain/java/qouteall/imm_ptl/core/compat/mixin/iris/MixinIrisSodiumChunkShaderInterface.java
@@ -1,67 +1,68 @@
-//package qouteall.imm_ptl.core.compat.mixin.iris;
-//
-//import net.caffeinemc.mods.sodium.client.render.chunk.shader.ChunkShaderOptions;
-//import net.irisshaders.iris.compat.sodium.impl.shader_overrides.IrisChunkShaderInterface;
-//import net.irisshaders.iris.compat.sodium.impl.shader_overrides.ShaderBindingContextExt;
-//import net.irisshaders.iris.gl.blending.BlendModeOverride;
-//import net.irisshaders.iris.pipeline.SodiumTerrainPipeline;
-//import net.irisshaders.iris.uniforms.custom.CustomUniforms;
-//import org.lwjgl.opengl.GL20C;
-//import org.lwjgl.opengl.GL21;
-//import org.spongepowered.asm.mixin.Mixin;
-//import org.spongepowered.asm.mixin.injection.At;
-//import org.spongepowered.asm.mixin.injection.Inject;
-//import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-//import qouteall.imm_ptl.core.render.FrontClipping;
-//import qouteall.q_misc_util.Helper;
-//
-//import java.util.List;
-//
-//@Mixin(value = IrisChunkShaderInterface.class, remap = false)
-//public class MixinIrisSodiumChunkShaderInterface {
-//    private int uIPClippingEquation;
-//
-//    private void ip_init(int shaderId) {
-//        uIPClippingEquation = GL20C.glGetUniformLocation(shaderId, "imm_ptl_ClippingEquation");
-//        if (uIPClippingEquation < 0) {
-//            Helper.err("uniform imm_ptl_ClippingEquation not found in transformed iris shader");
-//            uIPClippingEquation = -1;
-//        }
-//    }
-//
-//    @Inject(
-//        method = "<init>",
-//        at = @At("RETURN"),
-//        require = 0
-//    )
-//    private void onInit(
-//            int handle, ShaderBindingContextExt contextExt, SodiumTerrainPipeline pipeline, ChunkShaderOptions options, boolean isTess, boolean isShadowPass, BlendModeOverride blendModeOverride, List bufferOverrides, float alpha, CustomUniforms customUniforms, CallbackInfo ci
-//    ) {
-//        ip_init(handle);
-//    }
-//
-//    @Inject(
-//        method = "setupState",
-//        at = @At("RETURN")
-//    )
-//    private void onSetup(CallbackInfo ci) {
-//        if (uIPClippingEquation != -1) {
-//            if (FrontClipping.isClippingEnabled) {
-//                double[] equation = FrontClipping.getActiveClipPlaneEquationAfterModelView();
-//                GL21.glUniform4f(
-//                    uIPClippingEquation,
-//                    (float) equation[0],
-//                    (float) equation[1],
-//                    (float) equation[2],
-//                    (float) equation[3]
-//                );
-//            }
-//            else {
-//                GL21.glUniform4f(
-//                    uIPClippingEquation,
-//                    0, 0, 0, 1
-//                );
-//            }
-//        }
-//    }
-//}
+package qouteall.imm_ptl.core.compat.mixin.iris;
+
+import net.caffeinemc.mods.sodium.client.render.chunk.shader.ShaderBindingContext;
+import net.irisshaders.iris.gl.blending.BlendModeOverride;
+import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
+import net.irisshaders.iris.pipeline.programs.SodiumPrograms;
+import net.irisshaders.iris.pipeline.programs.SodiumShader;
+import net.irisshaders.iris.uniforms.custom.CustomUniforms;
+import org.lwjgl.opengl.GL20C;
+import org.lwjgl.opengl.GL21;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import qouteall.imm_ptl.core.render.FrontClipping;
+import qouteall.q_misc_util.Helper;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+@Mixin(value = SodiumShader.class, remap = false)
+public class MixinIrisSodiumChunkShaderInterface {
+    private int uIPClippingEquation;
+
+    private void ip_init(int shaderId) {
+        uIPClippingEquation = GL20C.glGetUniformLocation(shaderId, "imm_ptl_ClippingEquation");
+        if (uIPClippingEquation < 0) {
+            Helper.err("uniform imm_ptl_ClippingEquation not found in transformed iris shader");
+            uIPClippingEquation = -1;
+        }
+    }
+
+    @Inject(
+        method = "<init>",
+        at = @At("RETURN"),
+        require = 0
+    )
+    private void onInit(
+            IrisRenderingPipeline pipeline, SodiumPrograms.Pass pass, ShaderBindingContext context, int handle, BlendModeOverride blendModeOverride, List bufferBlendOverrides, CustomUniforms customUniforms, Supplier flipState, float alphaTest, boolean containsTessellation, CallbackInfo ci
+    ) {
+        ip_init(handle);
+    }
+
+    @Inject(
+        method = "setupState",
+        at = @At("RETURN")
+    )
+    private void onSetup(CallbackInfo ci) {
+        if (uIPClippingEquation != -1) {
+            if (FrontClipping.isClippingEnabled) {
+                double[] equation = FrontClipping.getActiveClipPlaneEquationAfterModelView();
+                GL21.glUniform4f(
+                    uIPClippingEquation,
+                    (float) equation[0],
+                    (float) equation[1],
+                    (float) equation[2],
+                    (float) equation[3]
+                );
+            }
+            else {
+                GL21.glUniform4f(
+                    uIPClippingEquation,
+                    0, 0, 0, 1
+                );
+            }
+        }
+    }
+}
diff --git a/...in/java/qouteall/imm_ptl/core/compat/mixin/iris/MixinIrisSodiumSodiumTerrainPipeline.java b/...in/java/qouteall/imm_ptl/core/compat/mixin/iris/MixinIrisSodiumSodiumTerrainPipeline.java
@@ -1,3 +1,4 @@
+// TODO This must be fixed, the commit this was changed with is https://github.com/IrisShaders/Iris/commit/e67ca5a310d936406d234289cd791a0be762f5c2 seems this should now target SodiumPrograms
 //package qouteall.imm_ptl.core.compat.mixin.iris;
 //
 //import com.mojang.blaze3d.shaders.Program;

diff --git a/src/main/resources/imm_ptl_compat.mixins.json b/src/main/resources/imm_ptl_compat.mixins.json
@@ -12,6 +12,7 @@
     "iris.MixinIrisIris",
     "iris.MixinIrisRenderingPipeline",
     "iris.MixinIrisShadowRenderTargets",
+    "iris.MixinIrisSodiumChunkShaderInterface",
     "sodium.IESodiumWorldRenderer",
     "sodium.MixinSodiumChunkShaderInterface",
     "sodium.MixinSodiumFlawlessFrames",