fix: shader issues #317

Author: MichaelHillcox

common/build.gradle

@@ -10,6 +10,12 @@ loom {
     }
 }
 
+repositories {
+    maven {
+        url = "https://cursemaven.com/"
+    }
+}
+
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings loom.officialMojangMappings()
@@ -19,6 +25,8 @@ dependencies {
     testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+
+    modCompileOnly "curse.maven:irisshaders-455508:${iris_version}"
 }
 
 test {

common/src/main/java/pro/mikey/xray/XRay.java

@@ -7,6 +7,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
+import pro.mikey.xray.compatability.IrisCompat;
 import pro.mikey.xray.screens.ScanManageScreen;
 import pro.mikey.xray.utils.XPlatShim;
 import pro.mikey.xray.core.ScanController;
@@ -26,6 +27,10 @@ public enum XRay {
 	public static final KeyMapping OPEN_GUI_KEY = new KeyMapping(I18n.get("xray.config.open"), GLFW.GLFW_KEY_G, CATEGORY);
 
 	public void init() {
+        if (XPLAT.isModLoaded("iris")) {
+            LOGGER.info("Iris detected, enabling compatibility features.");
+            IrisCompat.init();
+        }
 	}
 
 	public void onToggleKeyPressed() {

common/src/main/java/pro/mikey/xray/compatability/IrisCompat.java

@@ -0,0 +1,11 @@
+package pro.mikey.xray.compatability;
+
+import net.irisshaders.iris.api.v0.IrisApi;
+import net.irisshaders.iris.api.v0.IrisProgram;
+import pro.mikey.xray.core.OutlineRender;
+
+public class IrisCompat {
+    public static void init() {
+        IrisApi.getInstance().assignPipeline(OutlineRender.LINES_NO_DEPTH, IrisProgram.LINES);
+    }
+}

common/src/main/java/pro/mikey/xray/core/OutlineRender.java

@@ -5,12 +5,12 @@
 import com.mojang.blaze3d.pipeline.BlendFunction;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.pipeline.RenderTarget;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.LogicOp;
 import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.GpuTextureView;
 import com.mojang.blaze3d.vertex.*;
+import net.irisshaders.iris.api.v0.IrisApi;
+import net.irisshaders.iris.api.v0.IrisProgram;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.DynamicUniforms;
 import net.minecraft.client.renderer.RenderPipelines;
@@ -22,29 +22,27 @@
 import org.joml.Matrix4fStack;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
+import org.lwjgl.opengl.GL11;
 import pro.mikey.xray.XRay;
 
 import java.io.Closeable;
 import java.util.*;
 
 public class OutlineRender {
-    public static boolean requestedRefresh = false;
 
 	private static final RenderSystem.AutoStorageIndexBuffer indices = RenderSystem.getSequentialBuffer(VertexFormat.Mode.LINES);
 	private static final Map<ChunkPos, VBOHolder> vertexBuffers = new HashMap<>();
 
 	private static final Set<ChunkPos> chunksToRefresh = Collections.synchronizedSet(new HashSet<>());
 
-	public static RenderPipeline LINES_NO_DEPTH = RenderPipeline.builder(RenderPipelines.MATRICES_FOG_SNIPPET, RenderPipelines.GLOBALS_SNIPPET)
-			.withLocation(XRay.id("pipeline/xray_lines"))
-			.withVertexShader("core/rendertype_lines")
-			.withFragmentShader(ResourceLocation.fromNamespaceAndPath(XRay.MOD_ID, "frag/constant_color"))
-			.withBlend(BlendFunction.TRANSLUCENT)
-			.withCull(false)
-			.withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.LINES)
-			.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
-			.withColorLogic(LogicOp.NONE)
-			.build();
+    public static RenderPipeline LINES_NO_DEPTH = RenderPipeline.builder(RenderPipelines.MATRICES_FOG_SNIPPET, RenderPipelines.GLOBALS_SNIPPET)
+            .withLocation(ResourceLocation.fromNamespaceAndPath(XRay.MOD_ID, "pipeline/lines_2"))
+            .withVertexShader("core/rendertype_lines")
+            .withFragmentShader(ResourceLocation.fromNamespaceAndPath(XRay.MOD_ID, "frag/constant_color"))
+            .withBlend(BlendFunction.TRANSLUCENT)
+            .withCull(false)
+            .withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.LINES)
+            .build();
 
 	public static void renderBlocks(PoseStack poseStack) {
 		if (!ScanController.INSTANCE.isXRayActive() || Minecraft.getInstance().player == null) {
@@ -139,13 +137,18 @@ public static void renderBlocks(PoseStack poseStack) {
 					.createCommandEncoder()
 					.createRenderPass(() -> "xray", colorTextureView, OptionalInt.empty(), depthTextureView, OptionalDouble.empty())) {
 
+                GL11.glDisable(GL11.GL_DEPTH_TEST);
+
 				renderPass.setPipeline(LINES_NO_DEPTH);
 				RenderSystem.bindDefaultUniforms(renderPass);
 				renderPass.setVertexBuffer(0, holder.vertexBuffer);
 				renderPass.setIndexBuffer(gpuBuffer, indices.type());
 				renderPass.setUniform("DynamicTransforms", gpubufferslice[0]);
 				renderPass.setPipeline(LINES_NO_DEPTH);
 				renderPass.drawIndexed(0, 0, holder.indexCount, 1);
+
+                // Re-enable depth test after drawing
+                GL11.glEnable(GL11.GL_DEPTH_TEST);
 			}
 		}
 	}

common/src/main/java/pro/mikey/xray/utils/XPlatShim.java

@@ -10,4 +10,6 @@ public interface XPlatShim {
     TagKey<Block> oreTag();
 
     Supplier<Path> configPath();
+
+    boolean isModLoaded(String modId);
 }

fabric/src/main/java/pro/mikey/xray/fabric/XPlatShimImpl.java

@@ -21,4 +21,9 @@ public TagKey<Block> oreTag() {
     public Supplier<Path> configPath() {
         return configPath;
     }
+
+    @Override
+    public boolean isModLoaded(String modId) {
+        return FabricLoader.getInstance().isModLoaded(modId);
+    }
 }

gradle.properties

@@ -22,3 +22,4 @@ forge_version_range=21.9.0
 # Fabric
 loader_version=0.17.2
 fabric_version=0.134.0+1.21.9
+iris_version=7088024

neoforge/src/main/java/pro/mikey/xray/neoforge/XPlatShimImpl.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
+import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.neoforge.common.Tags;
 import pro.mikey.xray.utils.XPlatShim;
@@ -21,4 +22,9 @@ public TagKey<Block> oreTag() {
     public Supplier<Path> configPath() {
         return configPath;
     }
+
+    @Override
+    public boolean isModLoaded(String modId) {
+        return ModList.get().isLoaded(modId);
+    }
 }