Fix texture filtering sampling regression (#2115)

This commit is contained in:
Eclipse-Sol authored and GitHub committed 2026-09-19 10:12:14 -07:00
1 parent b6a4497fb3
commit ef68af5850
8 files changed
+67 -9

No files matched your search

@@ -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();
@@ -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;
@@ -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()
@@ -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;
@@ -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<S, T> implements OptionExtended<T> {
private final OptionStorage<S> storage;
@@ -23,7 +24,7 @@ public class OptionImpl<S, T> implements OptionExtended<T> {
private final OptionBinding<S, T> binding;
private final Control<T> control;
private final EnumSet<OptionFlag> flags;
private final Supplier<EnumSet<OptionFlag>> flags;
private final String name;
private final String tooltip;
@@ -41,7 +42,7 @@ public class OptionImpl<S, T> implements OptionExtended<T> {
String tooltip,
OptionBinding<S, T> binding,
Function<OptionImpl<S, T>, Control<T>> control,
EnumSet<OptionFlag> flags,
Supplier<EnumSet<OptionFlag>> flags,
OptionImpact impact,
boolean enabled) {
this.storage = storage;
@@ -121,7 +122,7 @@ public class OptionImpl<S, T> implements OptionExtended<T> {
@Override
public Collection<OptionFlag> getFlags() {
return this.flags;
return this.flags.get();
}
public static <S, T> OptionImpl.Builder<S, T> createBuilder(Class<T> type, OptionStorage<S> storage) {
@@ -136,6 +137,7 @@ public class OptionImpl<S, T> implements OptionExtended<T> {
private Function<OptionImpl<S, T>, Control<T>> control;
private OptionImpact impact;
private final EnumSet<OptionFlag> flags = EnumSet.noneOf(OptionFlag.class);
private Supplier<EnumSet<OptionFlag>> flagsSupplier = () -> this.flags;
private boolean enabled = true;
private Builder(OptionStorage<S> storage) {
@@ -202,13 +204,21 @@ public class OptionImpl<S, T> implements OptionExtended<T> {
return this;
}
public Builder<S, T> setFlags(Supplier<EnumSet<OptionFlag>> flags) {
Validate.notNull(flags, "Flags supplier must not be null");
this.flagsSupplier = flags;
return this;
}
public OptionImpl<S, T> 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);
}
}