Backport + Sodium 0.5.12

Author: IMS212

build.gradle.kts

@@ -10,11 +10,11 @@ object Constants {
     // https://semver.org/
     const val MOD_VERSION: String = "1.7.5"
 
-    const val CUSTOM_SODIUM: Boolean = false
-    const val CUSTOM_SODIUM_NAME: String = ""
+    const val CUSTOM_SODIUM: Boolean = true
+    const val CUSTOM_SODIUM_NAME: String = "sodium-fabric-0.5.12-snapshot+mc1.20.1-build.612.jar"
 
     const val IS_SHARED_BETA: Boolean = false
-    const val ACTIVATE_RENDERDOC: Boolean = false
+    const val ACTIVATE_RENDERDOC: Boolean = true
     const val BETA_TAG: String = "DH Support"
     const val BETA_VERSION = 4
 
@@ -41,7 +41,7 @@ plugins {
     // This prevents a lot of issues where the build script can fail randomly because the Fabric Maven server
     // is not reachable for some reason, and it makes builds much more reproducible. Observation also shows that it
     // really helps to improve startup times on slow connections.
-    id("fabric-loom") version "1.5.7"
+    id("fabric-loom") version "1.9.2"
     id("org.ajoberstar.grgit") version "5.2.2"
     id("com.github.gmazzo.buildconfig") version "5.3.5"
 }
@@ -66,6 +66,7 @@ loom {
             if (Constants.ACTIVATE_RENDERDOC && DefaultNativePlatform.getCurrentOperatingSystem().isLinux) {
                 environmentVariable("LD_PRELOAD", "/usr/lib/librenderdoc.so")
             }
+            vmArgs("-Dsodium.checks.issue2561=false")
         }
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/irisshaders/iris/compat/dh/DHCompatInternal.java

@@ -99,9 +99,9 @@ public DHCompatInternal(IrisRenderingPipeline pipeline, boolean dhShadowEnabled)
 	}
 
 	public static int getDhBlockRenderDistance() {
-		if (DhApi.Delayed.configs == null) {
+		if (DhApi.Delayed.configs == null || !dhEnabled) {
 			// Called before DH has finished setup
-			return 0;
+			return Minecraft.getInstance().options.getEffectiveRenderDistance();
 		}
 
 		return DhApi.Delayed.configs.graphics().chunkRenderDistance().getValue() * 16;

src/main/java/net/irisshaders/iris/gl/shader/StandardMacros.java

@@ -12,6 +12,7 @@
 import net.irisshaders.iris.texture.format.TextureFormat;
 import net.irisshaders.iris.texture.format.TextureFormatLoader;
 import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20C;
@@ -47,6 +48,7 @@ public static ImmutableList<StringPair> createStandardEnvironmentDefines() {
 		define(standardDefines, "IRIS_VERSION", getFormattedIrisVersion());
 		define(standardDefines, "MC_GL_VERSION", getGlVersion(GL20C.GL_VERSION));
 		define(standardDefines, "MC_GLSL_VERSION", getGlVersion(GL20C.GL_SHADING_LANGUAGE_VERSION));
+		define(standardDefines, "MC_MIPMAP_LEVEL", String.valueOf(Minecraft.getInstance().options.mipmapLevels().get()));
 		define(standardDefines, getOsString());
 		define(standardDefines, getVendor());
 		define(standardDefines, getRenderer());

src/main/java/net/irisshaders/iris/gl/texture/InternalTextureFormat.java

@@ -4,6 +4,7 @@
 import org.lwjgl.opengl.GL11C;
 import org.lwjgl.opengl.GL30C;
 import org.lwjgl.opengl.GL31C;
+import org.lwjgl.opengl.GL33C;
 
 import java.util.Locale;
 import java.util.Optional;
@@ -76,6 +77,7 @@ public enum InternalTextureFormat {
 	R3_G3_B2(GL11C.GL_R3_G3_B2, GlVersion.GL_11, PixelFormat.RGB),
 	RGB5_A1(GL11C.GL_RGB5_A1, GlVersion.GL_11, PixelFormat.RGBA),
 	RGB10_A2(GL11C.GL_RGB10_A2, GlVersion.GL_11, PixelFormat.RGBA),
+	RGB10_A2UI(GL33C.GL_RGB10_A2UI, GlVersion.GL_31, PixelFormat.RGBA_INTEGER),
 	R11F_G11F_B10F(GL30C.GL_R11F_G11F_B10F, GlVersion.GL_30, PixelFormat.RGB),
 	RGB9_E5(GL30C.GL_RGB9_E5, GlVersion.GL_30, PixelFormat.RGB);
 

src/main/java/net/irisshaders/iris/pipeline/transform/transformer/SodiumCoreTransformer.java

@@ -1,6 +1,9 @@
 package net.irisshaders.iris.pipeline.transform.transformer;
 
+import io.github.douira.glsl_transformer.ast.node.Identifier;
 import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
+import io.github.douira.glsl_transformer.ast.node.declaration.TypeAndInitDeclaration;
+import io.github.douira.glsl_transformer.ast.node.external_declaration.DeclarationExternalDeclaration;
 import io.github.douira.glsl_transformer.ast.query.Root;
 import io.github.douira.glsl_transformer.ast.transform.ASTParser;
 import net.irisshaders.iris.pipeline.transform.PatchShaderType;
@@ -25,9 +28,27 @@ public static void transform(
 			root.replaceReferenceExpressions(t, "vaPosition", "_vert_position + _get_draw_translation(_draw_id)");
 			root.replaceReferenceExpressions(t, "vaColor", "_vert_color");
 			root.rename("vaNormal", "iris_Normal");
-			root.replaceReferenceExpressions(t, "vaUV0", "_vert_tex_diffuse_coord");
+			root.replaceReferenceExpressions(t, "vaUV0", "((_vert_tex_diffuse_coord_bias * u_TexCoordShrink) + _vert_tex_diffuse_coord)");
 			root.replaceReferenceExpressions(t, "vaUV1", "ivec2(0, 10)");
-			root.rename("vaUV2", "a_LightCoord");
+
+			for (Identifier id : root.identifierIndex.get("vaUV2")) {
+				TypeAndInitDeclaration initDeclaration = (TypeAndInitDeclaration) id.getAncestor(
+					2, 0, TypeAndInitDeclaration.class::isInstance);
+				if (initDeclaration == null) {
+					continue;
+				}
+				DeclarationExternalDeclaration declaration = (DeclarationExternalDeclaration) initDeclaration.getAncestor(
+					1, 0, DeclarationExternalDeclaration.class::isInstance);
+				if (declaration == null) {
+					continue;
+				}
+				declaration.detachAndDelete();
+				initDeclaration.detachAndDelete();
+				id.detachAndDelete();
+
+			}
+
+			root.rename("vaUV2", "_vert_tex_light_coord");
 
 			root.replaceReferenceExpressions(t, "textureMatrix", "mat4(1.0)");
 

src/main/java/net/irisshaders/iris/pipeline/transform/transformer/SodiumTransformer.java

@@ -38,7 +38,7 @@ public static void transform(
 
 			if (parameters.inputs.hasTex()) {
 				root.replaceReferenceExpressions(t, "gl_MultiTexCoord0",
-					"vec4(_vert_tex_diffuse_coord, 0.0, 1.0)");
+					"vec4((_vert_tex_diffuse_coord_bias * u_TexCoordShrink) + _vert_tex_diffuse_coord, 0.0, 1.0)");
 			} else {
 				root.replaceReferenceExpressions(t, "gl_MultiTexCoord0",
 					"vec4(0.0, 0.0, 0.0, 1.0)");
@@ -136,20 +136,49 @@ public static void injectVertInit(
 			// translated from sodium's chunk_vertex.glsl
 			"vec3 _vert_position;",
 			"vec2 _vert_tex_diffuse_coord;",
-			"ivec2 _vert_tex_light_coord;",
+			"vec2 _vert_tex_diffuse_coord_bias;",
+			"vec2 _vert_tex_light_coord;",
+			"const uint POSITION_BITS        = 20u;",
+			"const uint POSITION_MAX_COORD   = 1u << POSITION_BITS;",
+			"const uint POSITION_MAX_VALUE   = POSITION_MAX_COORD - 1u;",
+
+			"const uint TEXTURE_BITS         = 15u;",
+			"const uint TEXTURE_MAX_COORD    = 1u << TEXTURE_BITS;",
+			"const uint TEXTURE_MAX_VALUE    = TEXTURE_MAX_COORD - 1u;",
+
+			"const float VERTEX_SCALE = 32.0 / float(POSITION_MAX_COORD);",
+			"const float VERTEX_OFFSET = -8.0;",
 			"vec4 _vert_color;",
 			"uint _draw_id;",
+			"""
+				uvec3 _deinterleave_u20x3(uvec2 data) {
+				    uvec3 hi = (uvec3(data.x) >> uvec3(0u, 10u, 20u)) & 0x3FFu;
+				    uvec3 lo = (uvec3(data.y) >> uvec3(0u, 10u, 20u)) & 0x3FFu;
+
+				    return (hi << 10u) | lo;
+				}
+				""",
+			"""
+				vec2 _get_texcoord() {
+				    return vec2(a_TexCoord & TEXTURE_MAX_VALUE) / float(TEXTURE_MAX_COORD);
+				}
+				""",
+				"""
+				vec2 _get_texcoord_bias() {
+				    return mix(vec2(-1.0), vec2(1.0), bvec2(a_TexCoord >> TEXTURE_BITS));
+				}
+				""",
 			"const uint MATERIAL_USE_MIP_OFFSET = 0u;",
 			"float _material_mip_bias(uint material) {\n" +
 				"    return ((material >> MATERIAL_USE_MIP_OFFSET) & 1u) != 0u ? 0.0f : -4.0f;\n" +
 				"}",
 			"void _vert_init() {" +
-				"_vert_position = (vec3(a_PosId.xyz) * 0.00048828125 + -8.0"
-				+ ");" +
-				"_vert_tex_diffuse_coord = (a_TexCoord * " + (1.0f / 32768.0f) + ");" +
-				"_vert_tex_light_coord = a_LightCoord;" +
+				"_vert_position = (_deinterleave_u20x3(a_Position) * VERTEX_SCALE) + VERTEX_OFFSET;" +
+				"_vert_tex_diffuse_coord = _get_texcoord();" +
+				"_vert_tex_diffuse_coord_bias = _get_texcoord_bias();" +
+				"_vert_tex_light_coord = vec2(a_LightAndData.xy);" +
 				"_vert_color = " + separateAo + ";" +
-				"_draw_id = (a_PosId.w >> 8u) & 0xFFu; }",
+				"_draw_id = a_LightAndData[3]; }",
 
 			"uvec3 _get_relative_chunk_coord(uint pos) {\n" +
 				"    // Packing scheme is defined by LocalSectionIndex\n" +
@@ -158,10 +187,11 @@ public static void injectVertInit(
 			"vec3 _get_draw_translation(uint pos) {\n" +
 				"    return _get_relative_chunk_coord(pos) * vec3(16.0f);\n" +
 				"}\n");
-		addIfNotExists(root, t, tree, "a_PosId", Type.U32VEC4, StorageQualifier.StorageType.IN);
-		addIfNotExists(root, t, tree, "a_TexCoord", Type.F32VEC2, StorageQualifier.StorageType.IN);
+		addIfNotExists(root, t, tree, "a_Position", Type.U32VEC2, StorageQualifier.StorageType.IN);
+		addIfNotExists(root, t, tree, "a_TexCoord", Type.U32VEC2, StorageQualifier.StorageType.IN);
 		addIfNotExists(root, t, tree, "a_Color", Type.F32VEC4, StorageQualifier.StorageType.IN);
-		addIfNotExists(root, t, tree, "a_LightCoord", Type.I32VEC2, StorageQualifier.StorageType.IN);
+		addIfNotExists(root, t, tree, "a_LightAndData", Type.I32VEC4, StorageQualifier.StorageType.IN);
+		addIfNotExists(root, t, tree, "u_TexCoordShrink", Type.F32VEC2, StorageQualifier.StorageType.UNIFORM);
 		tree.prependMainFunctionBody(t, "_vert_init();");
 	}
 

src/main/java/net/irisshaders/iris/shaderpack/properties/PackShadowDirectives.java

@@ -7,6 +7,7 @@
 import net.irisshaders.iris.gl.texture.InternalTextureFormat;
 import net.irisshaders.iris.helpers.OptionalBoolean;
 import net.irisshaders.iris.shaderpack.parsing.DirectiveHolder;
+import net.irisshaders.iris.shadows.ShadowMatrices;
 import org.joml.Vector4f;
 
 import java.util.Optional;
@@ -60,8 +61,8 @@ public PackShadowDirectives(ShaderProperties properties) {
 		// shadowRenderDistanceMul to a nonzero value, since having a high shadow render distance will impact
 		// performance quite heavily on most systems.
 		this.distance = 160.0f;
-		this.nearPlane = 0.05f;
-		this.farPlane = 256.0f;
+		this.nearPlane = ShadowMatrices.NEAR;
+		this.farPlane = ShadowMatrices.FAR;
 		this.voxelDistance = 0.0f;
 
 		// By default, shadows are not culled based on distance from the player. However, pack authors may

src/main/java/net/irisshaders/iris/shadows/ShadowMatrices.java

@@ -5,22 +5,12 @@
 import org.joml.Matrix4f;
 
 public class ShadowMatrices {
-	private static final float NEAR = 0.05f;
-	private static final float FAR = 256.0f;
-
-	// NB: These matrices are in column-major order, not row-major order like what you'd expect!
+	public static final float NEAR = -100.05f;
+	public static final float FAR = 156.0f;
 
 	public static Matrix4f createOrthoMatrix(float halfPlaneLength, float nearPlane, float farPlane) {
-		return new Matrix4f(
-			// column 1
-			1.0f / halfPlaneLength, 0f, 0f, 0f,
-			// column 2
-			0f, 1.0f / halfPlaneLength, 0f, 0f,
-			// column 3
-			0f, 0f, 2.0f / (nearPlane - farPlane), 0f,
-			// column 4
-			0f, 0f, -(farPlane + nearPlane) / (farPlane - nearPlane), 1f
-		);
+		//System.out.println("making a matrix with " + nearPlane + " / " + farPlane + " * " + halfPlaneLength);
+		return new Matrix4f().setOrthoSymmetric(halfPlaneLength * 2, halfPlaneLength * 2, nearPlane, farPlane);
 	}
 
 	public static Matrix4f createPerspectiveMatrix(float fov) {
@@ -50,7 +40,6 @@ public static void createBaselineModelViewMatrix(PoseStack target, float shadowA
 		target.last().normal().identity();
 		target.last().pose().identity();
 
-		target.last().pose().translate(0.0f, 0.0f, -100.0f);
 		target.mulPose(Axis.XP.rotationDegrees(90.0F));
 		target.mulPose(Axis.ZP.rotationDegrees(skyAngle * -360.0f));
 		target.mulPose(Axis.XP.rotationDegrees(sunPathRotation));

src/main/java/net/irisshaders/iris/shadows/ShadowRenderer.java

@@ -39,6 +39,7 @@
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 import net.minecraft.core.BlockPos;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import org.joml.Matrix4f;
@@ -439,7 +440,7 @@ public void renderShadows(LevelRendererAccessor levelRenderer, Camera playerCame
 			// If FOV is not null, the pack wants a perspective based projection matrix. (This is to support legacy packs)
 			shadowProjection = ShadowMatrices.createPerspectiveMatrix(this.fov);
 		} else {
-			shadowProjection = ShadowMatrices.createOrthoMatrix(halfPlaneLength, nearPlane < 0 ? -DHCompat.getRenderDistance() : nearPlane, farPlane < 0 ? DHCompat.getRenderDistance() : farPlane);
+			shadowProjection = ShadowMatrices.createOrthoMatrix(halfPlaneLength, Mth.equal(nearPlane, -1.0f) ? -DHCompat.getRenderDistance() * 16 : nearPlane, Mth.equal(farPlane, -1.0f) ? DHCompat.getRenderDistance() * 16 : farPlane);
 		}
 
 		IrisRenderSystem.setShadowProjection(shadowProjection);

src/main/java/net/irisshaders/iris/uniforms/MatrixUniforms.java

@@ -5,6 +5,7 @@
 import net.irisshaders.iris.shaderpack.properties.PackDirectives;
 import net.irisshaders.iris.shadows.ShadowMatrices;
 import net.irisshaders.iris.shadows.ShadowRenderer;
+import net.minecraft.util.Mth;
 import org.joml.Matrix4f;
 
 import java.util.function.Supplier;
@@ -22,10 +23,9 @@ public static void addMatrixUniforms(UniformHolder uniforms, PackDirectives dire
 		addShadowMatrix(uniforms, "ModelView", () ->
 			new Matrix4f(ShadowRenderer.createShadowModelView(directives.getSunPathRotation(), directives.getShadowDirectives().getIntervalSize()).last().pose()));
 		addShadowMatrix(uniforms, "Projection", () -> ShadowMatrices.createOrthoMatrix(directives.getShadowDirectives().getDistance(),
-			directives.getShadowDirectives().getNearPlane() < 0 ? -DHCompat.getRenderDistance() : directives.getShadowDirectives().getNearPlane(),
-			directives.getShadowDirectives().getFarPlane() < 0 ? DHCompat.getRenderDistance() : directives.getShadowDirectives().getFarPlane()));
+			Mth.equal(directives.getShadowDirectives().getNearPlane(), -1.0f) ? -DHCompat.getRenderDistance() * 16 : directives.getShadowDirectives().getNearPlane(),
+			Mth.equal(directives.getShadowDirectives().getFarPlane(), -1.0f) ? DHCompat.getRenderDistance() * 16 : directives.getShadowDirectives().getFarPlane()));
 	}
-
 	private static void addMatrix(UniformHolder uniforms, String name, Supplier<Matrix4f> supplier) {
 		uniforms
 			.uniformMatrix(PER_FRAME, "gbuffer" + name, supplier)

src/main/resources/fabric.mod.json

@@ -41,8 +41,7 @@
       "1.20.1"
     ],
     "sodium": [
-      "0.5.10",
-      "0.5.11"
+      "0.5.x"
     ]
   },
   "breaks": {

src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/impl/shader_overrides/IrisChunkProgramOverrides.java

@@ -5,6 +5,7 @@
 import me.jellysquid.mods.sodium.client.gl.shader.GlShader;
 import me.jellysquid.mods.sodium.client.gl.shader.ShaderType;
 import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkFogMode;
+import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkShaderBindingPoints;
 import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkShaderOptions;
 import me.jellysquid.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
 import me.jellysquid.mods.sodium.client.render.chunk.vertex.format.ChunkVertexType;
@@ -242,10 +243,10 @@ private GlProgram<IrisChunkShaderInterface> createShader(IrisTerrainPass pass, S
 			return builder.attachShader(vertShader)
 				.attachShader(fragShader)
 				// The following 4 attributes are part of Sodium.
-				.bindAttribute("a_PosId", IrisChunkShaderBindingPoints.ATTRIBUTE_POSITION_ID)
-				.bindAttribute("a_Color", IrisChunkShaderBindingPoints.ATTRIBUTE_COLOR)
-				.bindAttribute("a_TexCoord", IrisChunkShaderBindingPoints.ATTRIBUTE_BLOCK_TEXTURE)
-				.bindAttribute("a_LightCoord", IrisChunkShaderBindingPoints.ATTRIBUTE_LIGHT_TEXTURE)
+				.bindAttribute("a_Position", ChunkShaderBindingPoints.ATTRIBUTE_POSITION)
+				.bindAttribute("a_Color", ChunkShaderBindingPoints.ATTRIBUTE_COLOR)
+				.bindAttribute("a_TexCoord", ChunkShaderBindingPoints.ATTRIBUTE_TEXTURE)
+				.bindAttribute("a_LightAndData", ChunkShaderBindingPoints.ATTRIBUTE_LIGHT_MATERIAL_INDEX)
 				.bindAttribute("mc_Entity", IrisChunkShaderBindingPoints.BLOCK_ID)
 				.bindAttribute("mc_midTexCoord", IrisChunkShaderBindingPoints.MID_TEX_COORD)
 				.bindAttribute("at_tangent", IrisChunkShaderBindingPoints.TANGENT)