More minor changes

huosikin · Mar 9, 2024 · c38ee6e · c38ee6e
1 parent 5faebd9
commit c38ee6e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "iris"
+rootProject.name = "Iris"
 
 pluginManagement {
     repositories {

diff --git a/src/main/java/net/irisshaders/iris/compat/dh/DHCompat.java b/src/main/java/net/irisshaders/iris/compat/dh/DHCompat.java
@@ -1,6 +1,7 @@
 package net.irisshaders.iris.compat.dh;
 
 import net.irisshaders.iris.Iris;
+import net.irisshaders.iris.gl.shader.ShaderCompileException;
 import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
 import net.irisshaders.iris.uniforms.CapturedRenderingState;
 import net.fabricmc.loader.api.FabricLoader;
@@ -32,7 +33,11 @@ public DHCompat(IrisRenderingPipeline pipeline, boolean renderDHShadow) {
 			}
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException |
                  ClassNotFoundException e) {
-            throw new RuntimeException(e);
+            if (e.getCause() instanceof ShaderCompileException sce) {
+				throw sce;
+			} else {
+				throw new RuntimeException(e);
+			}
         }
     }
 

diff --git a/src/main/java/net/irisshaders/iris/compat/dh/LodRendererEvents.java b/src/main/java/net/irisshaders/iris/compat/dh/LodRendererEvents.java
@@ -83,6 +83,7 @@ private static void setupSetDeferredBeforeRenderingEvent() {
 			public void beforeRender(DhApiCancelableEventParam<DhApiRenderParam> event) {
 
 				DhApi.Delayed.renderProxy.setDeferTransparentRendering(IrisApi.getInstance().isShaderPackInUse());
+				DhApi.Delayed.configs.graphics().fog().drawMode().setValue(getInstance().shouldOverride ? EFogDrawMode.FOG_DISABLED : EFogDrawMode.FOG_ENABLED);
 			}
 		};
 
@@ -208,6 +209,10 @@ private static void setupBeforeRenderFrameBufferBinding() {
 			public void beforeSetup(DhApiEventParam<DhApiRenderParam> event) {
 				DHCompatInternal instance = getInstance();
 
+				OverrideInjector.INSTANCE.unbind(IDhApiShadowCullingFrustum.class, (IDhApiOverrideable) ShadowRenderer.FRUSTUM);
+				OverrideInjector.INSTANCE.unbind(IDhApiFramebuffer.class, instance.getShadowFBWrapper());
+				OverrideInjector.INSTANCE.unbind(IDhApiFramebuffer.class, instance.getSolidFBWrapper());
+
 				if (instance.shouldOverride) {
 					if (ShadowRenderingState.areShadowsCurrentlyBeingRendered() && instance.shouldOverrideShadow) {
 						OverrideInjector.INSTANCE.bind(IDhApiFramebuffer.class, instance.getShadowFBWrapper());