From ef68af58505ba1e1706cd51c466293ffa3bf9214 Mon Sep 17 00:00:00 2001 From: Eclipse-Sol Date: Sat, 19 Sep 2026 13:12:14 -0400 Subject: [PATCH] Fix texture filtering sampling regression (#2115) --- .../angelica/glsm/GLErrorReporter.java | 12 ++++++++++++ .../angelica/glsm/GLStateManager.java | 2 +- .../celeritas/AngelicaChunkRenderer.java | 4 ++++ .../AngelicaRenderPassConfiguration.java | 11 +++++++++-- .../client/gui/SodiumGameOptionPages.java | 5 +++++ .../sodium/client/gui/SodiumGameOptions.java | 5 +++++ .../sodium/client/gui/options/OptionImpl.java | 18 ++++++++++++++---- .../shaders/blocks/block_layer_opaque.fsh | 19 +++++++++++++++++-- 8 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLErrorReporter.java diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLErrorReporter.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLErrorReporter.java new file mode 100644 index 000000000..6d7e88769 --- /dev/null +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLErrorReporter.java @@ -0,0 +1,12 @@ +package com.gtnewhorizons.angelica.glsm; + +import org.lwjgl.opengl.OpenGLException; + +final class GLErrorReporter { + + private GLErrorReporter() {} + + static void reportError(int error) { + throw new OpenGLException(error); + } +} diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 534e23d4c..5bd09232c 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -5400,7 +5400,7 @@ public class GLStateManager { public static void checkGLError() { final int error = glGetError(); - if (error != GL11.GL_NO_ERROR) throw new org.lwjgl.opengl.OpenGLException(error); + if (error != GL11.GL_NO_ERROR) GLErrorReporter.reportError(error); } public static String glGetString(int pname) { diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java index db83bea7a..bdd599477 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java @@ -202,6 +202,10 @@ class AngelicaChunkRenderer extends DefaultChunkRenderer { } private void bindTerrainSampler() { + if (!SodiumGameOptions.usesTerrainTexelSnap()) { + return; + } + final int anisotropy = SodiumGameOptions.resolvedAnisotropicFiltering(); final boolean nearest = ClientProxy.options().quality.texelSampling.isNearest(); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderPassConfiguration.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderPassConfiguration.java index 27c8d0cb5..f26daca3a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderPassConfiguration.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderPassConfiguration.java @@ -30,13 +30,20 @@ public class AngelicaRenderPassConfiguration { .vertexType(vertexType) .primitiveType(QuadPrimitiveType.TRIANGULATED); + final int mipmapLevels = SodiumGameOptions.terrainMipmapLevels(); + if (rgssEnabled) { builder.extraDefine("USE_RGSS", ""); } + if (SodiumGameOptions.usesTerrainTexelSnap()) { + builder.extraDefine("USE_TEXEL_SNAP", ""); + } if (SodiumGameOptions.effectiveTextureFilterMode().usesAnisotropy()) { builder.extraDefine("USE_ANISOTROPIC", ""); - builder.extraDefine("TERRAIN_GUTTER", - SpritePadding.gutterFor(SodiumGameOptions.terrainMipmapLevels(), true) + ".0"); + builder.extraDefine("TERRAIN_GUTTER", SpritePadding.gutterFor(mipmapLevels, true) + ".0"); + } + if (mipmapLevels <= 0) { + builder.extraDefine("TERRAIN_NO_MIPS", ""); } return builder; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index dffcd2bd4..615b45612 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -2,6 +2,7 @@ package me.jellysquid.mods.sodium.client.gui; import java.io.IOException; import java.util.ArrayList; +import java.util.EnumSet; import java.util.List; import java.util.function.BiConsumer; import java.util.function.Supplier; @@ -202,6 +203,10 @@ public class SodiumGameOptionPages { .setBinding((opts, value) -> opts.quality.texelSampling = value, opts -> opts.quality.texelSampling) .setImpact(OptionImpact.LOW) + // Only this mode needs a rerender + .setFlags(() -> textureFilterMode.getValue() == TextureFilterMode.NONE + ? EnumSet.of(OptionFlag.REQUIRES_RENDERER_RELOAD) + : EnumSet.noneOf(OptionFlag.class)) .build(); groups.add(OptionGroup.createBuilder() diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java index 0f6749313..0250c65fb 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java @@ -80,6 +80,11 @@ public class SodiumGameOptions { return resolveFilterMode(ClientProxy.options().quality.textureFilterMode); } + public static boolean usesTerrainTexelSnap() { + return effectiveTextureFilterMode() != TextureFilterMode.NONE + || !ClientProxy.options().quality.texelSampling.isNearest(); + } + public static TextureFilterMode resolveFilterMode(TextureFilterMode mode) { if (mode == null) { mode = TextureFilterMode.RGSS_ANISOTROPIC; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/OptionImpl.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/OptionImpl.java index e81389631..c05f607e1 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/OptionImpl.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/OptionImpl.java @@ -16,6 +16,7 @@ import java.util.EnumSet; import java.util.function.BiConsumer; import java.util.function.BooleanSupplier; import java.util.function.Function; +import java.util.function.Supplier; public class OptionImpl implements OptionExtended { private final OptionStorage storage; @@ -23,7 +24,7 @@ public class OptionImpl implements OptionExtended { private final OptionBinding binding; private final Control control; - private final EnumSet flags; + private final Supplier> flags; private final String name; private final String tooltip; @@ -41,7 +42,7 @@ public class OptionImpl implements OptionExtended { String tooltip, OptionBinding binding, Function, Control> control, - EnumSet flags, + Supplier> flags, OptionImpact impact, boolean enabled) { this.storage = storage; @@ -121,7 +122,7 @@ public class OptionImpl implements OptionExtended { @Override public Collection getFlags() { - return this.flags; + return this.flags.get(); } public static OptionImpl.Builder createBuilder(Class type, OptionStorage storage) { @@ -136,6 +137,7 @@ public class OptionImpl implements OptionExtended { private Function, Control> control; private OptionImpact impact; private final EnumSet flags = EnumSet.noneOf(OptionFlag.class); + private Supplier> flagsSupplier = () -> this.flags; private boolean enabled = true; private Builder(OptionStorage storage) { @@ -202,13 +204,21 @@ public class OptionImpl implements OptionExtended { return this; } + public Builder setFlags(Supplier> flags) { + Validate.notNull(flags, "Flags supplier must not be null"); + + this.flagsSupplier = flags; + + return this; + } + public OptionImpl build() { Validate.notNull(this.name, "Name must be specified"); Validate.notNull(this.tooltip, "Tooltip must be specified"); Validate.notNull(this.binding, "Option binding must be specified"); Validate.notNull(this.control, "Control must be specified"); - return new OptionImpl<>(this.storage, this.name, this.tooltip, this.binding, this.control, this.flags, this.impact, this.enabled); + return new OptionImpl<>(this.storage, this.name, this.tooltip, this.binding, this.control, this.flagsSupplier, this.impact, this.enabled); } } diff --git a/src/main/resources/assets/angelica/shaders/blocks/block_layer_opaque.fsh b/src/main/resources/assets/angelica/shaders/blocks/block_layer_opaque.fsh index 40ca2663e..00b2ada14 100644 --- a/src/main/resources/assets/angelica/shaders/blocks/block_layer_opaque.fsh +++ b/src/main/resources/assets/angelica/shaders/blocks/block_layer_opaque.fsh @@ -68,13 +68,18 @@ float footprintScale(vec2 du, vec2 dv, vec2 texelSize, float limitTexels) { #endif vec4 sampleTexelSnapped(sampler2D tex, vec2 uv, vec2 texelSize, vec2 du, vec2 dv, vec2 texelsPerPixel) { + vec2 snapped = snapToTexelCentre(uv, texelSize, texelsPerPixel); + +#if defined(TERRAIN_NO_MIPS) && !defined(USE_ANISOTROPIC) + return textureLod(tex, snapped, 0.0); +#else float gradientScale = exp2(v_MaterialMipBias); #ifdef USE_ANISOTROPIC gradientScale *= footprintScale(du * gradientScale, dv * gradientScale, texelSize, TERRAIN_GUTTER); #endif - return textureGrad(tex, snapToTexelCentre(uv, texelSize, texelsPerPixel), - du * gradientScale, dv * gradientScale); + return textureGrad(tex, snapped, du * gradientScale, dv * gradientScale); +#endif } vec4 sampleTexelSnapped(sampler2D tex, vec2 uv, vec2 texelSize) { @@ -132,6 +137,12 @@ vec4 sampleRGSS(sampler2D tex, vec2 uv, vec2 texelSize) { for (int i = 0; i < 4; i++) { rgss += textureGrad(tex, uv + RGSS_OFFSETS[i].x * spreadU + RGSS_OFFSETS[i].y * spreadV, gradU, gradV); } +#elif defined(TERRAIN_NO_MIPS) + const float lod = 0.0; + + for (int i = 0; i < 4; i++) { + rgss += textureLod(tex, uv + RGSS_OFFSETS[i] * texelSize, lod); + } #else float duLength = length(du / texelSize); float dvLength = length(dv / texelSize); @@ -152,12 +163,16 @@ vec4 sampleRGSS(sampler2D tex, vec2 uv, vec2 texelSize) { #endif void main() { +#ifdef USE_TEXEL_SNAP vec2 texelSize = 1.0 / vec2(textureSize(u_BlockTex, 0)); #ifdef USE_RGSS vec4 diffuseColor = sampleRGSS(u_BlockTex, v_TexCoord, texelSize); #else vec4 diffuseColor = sampleTexelSnapped(u_BlockTex, v_TexCoord, texelSize); #endif +#else + vec4 diffuseColor = texture(u_BlockTex, v_TexCoord, v_MaterialMipBias); +#endif #ifdef USE_FRAGMENT_DISCARD if (diffuseColor.a < v_MaterialAlphaCutoff) {