Cache transformed and compiled shaders on disk (#2194)

This commit is contained in:
Jason Mitchell authored and GitHub committed 2026-10-02 22:35:08 -07:00
1 parent d876a203da
commit 37afddab5d
40 files changed
+2131 -338

No files matched your search

@@ -4,6 +4,7 @@ import com.gtnewhorizons.angelica.debug.DebugKeyHandler;
import com.gtnewhorizons.angelica.rendering.culling.GpuCulling;
import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID;
import java.io.File;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.util.Locale;
@@ -40,6 +41,7 @@ import com.gtnewhorizon.gtnhlib.client.renderer.vao.VAOManager;
import com.gtnewhorizons.angelica.client.font.DarkModeUtils;
import com.gtnewhorizons.angelica.commands.AngelicaCommand;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.Tags;
import com.gtnewhorizons.angelica.common.BlockError;
import com.gtnewhorizons.angelica.common.BlockIsbrhTest;
import com.gtnewhorizons.angelica.compat.ModStatus;
@@ -62,6 +64,7 @@ import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.backend.VSyncMode;
import com.gtnewhorizons.angelica.glsm.profiling.Tracy;
import com.gtnewhorizons.angelica.glsm.shader.ShaderDiskCache;
import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
import com.gtnewhorizons.angelica.iris.IrisGLSMBridge;
import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt;
@@ -148,6 +151,11 @@ public final class ClientProxy extends CommonProxy {
BlockIsbrhTest.renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(BlockIsbrhTest.renderId, new IsbrhTestRenderer());
}
final File source = event.getSourceFile();
if (source != null && source.isFile()) {
ShaderDiskCache.configure(Minecraft.getMinecraft().mcDataDir.toPath().resolve("angelica").resolve("shadercache"),
Tags.VERSION + "|" + source.length() + "|" + source.lastModified());
}
if (AngelicaConfig.enableIris) {
IrisGLSMBridge.installImmediateExtendedHandler();
Iris.warmupShaderTransforms();
@@ -58,6 +58,10 @@ public final class RwImageStoreExtractor {
private static volatile Map<String, ImageInformation> activeCustomImages = Map.of();
static Map<String, ImageInformation> activeCustomImages() {
return activeCustomImages;
}
public static void setActiveCustomImages(Map<String, ImageInformation> images) {
activeCustomImages = (images == null) ? Map.of() : Map.copyOf(images);
}
@@ -8,6 +8,7 @@ import com.gtnewhorizons.angelica.glsm.backend.BackendManager;
import com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexType;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import net.coderbot.iris.Iris;
import com.gtnewhorizons.angelica.glsm.shader.ShaderDiskCache;
import com.gtnewhorizons.angelica.glsm.shader.ShaderType;
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
@@ -22,13 +23,19 @@ import org.taumc.glsl.Transformer;
import org.taumc.glsl.grammar.GLSLLexer;
import org.taumc.glsl.grammar.GLSLParser;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.BooleanSupplier;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -226,6 +233,57 @@ public class ShaderTransformer {
record StageArtifact(GLSLParser.Translation_unitContext tree, int headerLen) {}
static ShaderDiskCache.Key diskKey(Patch patch, EnumMap<PatchShaderType, String> inputs, Parameters parameters) {
final ShaderDiskCache.Key k = ShaderDiskCache.key("iris-transform").str(patch.name());
parameters.appendDiskKey(k);
k.i(RenderSystem.getMaxGlslVersion()).b(RenderSystem.supportsSSBO()).b(RenderSystem.supportsImageLoadStore())
.b(RenderSystem.isGLES()).b(BackendManager.RENDER_BACKEND.isSDLGPU()).i(maxSupportedHoistVersion);
if (enabledRequirements == null) {
k.i(-1);
} else {
k.i(enabledRequirements.length);
for (VersionRequirement r : enabledRequirements) k.str(r.keyword());
}
appendSorted(k, SamplerToStorageImageRewriter.activeCandidates(), Object::toString);
appendSorted(k, RwImageStoreExtractor.activeCustomImages().entrySet(), e -> e.getKey() + "=" + e.getValue());
if (patch == Patch.CELERITAS_TERRAIN) k.str(CeleritasHeader.VALUE);
for (PatchShaderType t : PatchShaderType.VALUES) k.str(inputs.get(t));
return k;
}
private static <T> void appendSorted(ShaderDiskCache.Key k, Collection<T> items, Function<T, String> render) {
final List<String> rendered = new ArrayList<>(items.size());
for (T item : items) rendered.add(render.apply(item));
k.sortedStrs(rendered);
}
private static Map<PatchShaderType, String> diskOrCompute(Patch patchType, EnumMap<PatchShaderType, String> inputs, Parameters parameters, Supplier<Map<PatchShaderType, String>> compute) {
final ShaderDiskCache.Key diskKey = ShaderDiskCache.isEnabled() ? diskKey(patchType, inputs, parameters) : null;
final Map<PatchShaderType, String> fromDisk = diskKey != null ? readDisk(diskKey) : null;
if (fromDisk != null) return fromDisk;
final Map<PatchShaderType, String> result = compute.get();
if (diskKey != null) writeDisk(diskKey, result);
return result;
}
private static Map<PatchShaderType, String> readDisk(ShaderDiskCache.Key key) {
final Map<String, String> stored = ShaderDiskCache.getStrings(key);
if (stored == null) return null;
try {
final EnumMap<PatchShaderType, String> out = new EnumMap<>(PatchShaderType.class);
for (Map.Entry<String, String> e : stored.entrySet()) out.put(PatchShaderType.valueOf(e.getKey()), e.getValue());
return out;
} catch (RuntimeException e) {
return null;
}
}
private static void writeDisk(ShaderDiskCache.Key key, Map<PatchShaderType, String> result) {
final Map<String, String> out = new LinkedHashMap<>();
for (Map.Entry<PatchShaderType, String> e : result.entrySet()) out.put(e.getKey().name(), e.getValue());
ShaderDiskCache.putStrings(key, out);
}
public static <P extends Parameters> Map<PatchShaderType, String> transform(String vertex, String geometry, String tessControl, String tessEval, String fragment, P parameters) {
return transform(vertex, geometry, tessControl, tessEval, fragment, parameters, null);
}
@@ -251,7 +309,7 @@ public class ShaderTransformer {
result = shaderTransformationCache.getAndMoveToLast(key);
}
if(result == null || !useCache) {
result = transformInternal(inputs, patchType, parameters, artifactsOut);
result = diskOrCompute(patchType, inputs, parameters, () -> transformInternal(inputs, patchType, parameters, artifactsOut));
// Clear this, we don't want whatever random type was last transformed being considered for the key
parameters.type = null;
synchronized (shaderTransformationCache) {
@@ -293,7 +351,7 @@ public class ShaderTransformer {
result = shaderTransformationCache.getAndMoveToLast(key);
}
if (result == null || !useCache) {
result = transformComputeInternal(compute, patchType, parameters, artifactsOut);
result = diskOrCompute(patchType, inputs, parameters, () -> transformComputeInternal(compute, patchType, parameters, artifactsOut));
// Clear this, we don't want whatever random type was last transformed being considered for the key
parameters.type = null;
synchronized (shaderTransformationCache) {
@@ -481,7 +539,7 @@ public class ShaderTransformer {
String headerTail = stageHeader.extensions();
// For Celeritas terrain vertex shaders, inject chunk_vertex.glsl header
if (patchType == Patch.CELERITAS_TERRAIN && shaderType == PatchShaderType.VERTEX) {
headerTail += computeCeleritasHeader();
headerTail += CeleritasHeader.VALUE;
}
final StringBuilder formattedShaderBuilder = new StringBuilder();
@@ -664,6 +722,10 @@ public class ShaderTransformer {
}
}
private static final class CeleritasHeader {
static final String VALUE = computeCeleritasHeader();
}
private static String computeCeleritasHeader() {
final ShaderConstants constants = ShaderConstants.builder()
.add("VERT_POS_SCALE", "1.0")
@@ -1,6 +1,7 @@
package net.coderbot.iris.pipeline.transform.parameter;
import com.gtnewhorizons.angelica.glsm.ffp.Instancing;
import com.gtnewhorizons.angelica.glsm.shader.ShaderDiskCache;
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
import net.coderbot.iris.pipeline.transform.Patch;
import net.coderbot.iris.shaderpack.texture.TextureStage;
@@ -27,6 +28,12 @@ public class AttributeParameters extends Parameters {
return TextureStage.GBUFFERS_AND_SHADOW;
}
@Override
public void appendDiskKey(ShaderDiskCache.Key k) {
super.appendDiskKey(k);
k.b(hasGeometry).b(hasTesselation).str(inputs == null ? null : inputs.name()).b(scrollGlint).str(instancing.name());
}
@Override
public int hashCode() {
final int prime = 31;
@@ -2,12 +2,16 @@ package net.coderbot.iris.pipeline.transform.parameter;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import net.coderbot.iris.gl.blending.AlphaTest;
import com.gtnewhorizons.angelica.glsm.shader.ShaderDiskCache;
import com.gtnewhorizons.angelica.glsm.shader.ShaderType;
import com.gtnewhorizons.angelica.glsm.texture.TextureType;
import net.coderbot.iris.helpers.Tri;
import net.coderbot.iris.pipeline.transform.Patch;
import net.coderbot.iris.shaderpack.texture.TextureStage;
import java.util.ArrayList;
import java.util.List;
public abstract class Parameters {
public final Patch patch;
private final Object2ObjectMap<Tri<String, TextureType, TextureStage>, String> textureMap;
@@ -29,6 +33,20 @@ public abstract class Parameters {
return textureMap;
}
public void appendDiskKey(ShaderDiskCache.Key k) {
k.str(getClass().getName());
if (textureMap == null) {
k.i(-1);
return;
}
final List<String> rendered = new ArrayList<>(textureMap.size());
for (Object2ObjectMap.Entry<Tri<String, TextureType, TextureStage>, String> e : textureMap.object2ObjectEntrySet()) {
final Tri<String, TextureType, TextureStage> tri = e.getKey();
rendered.add(tri.first() + "\0" + tri.second().name() + "\0" + tri.third().name() + "\0" + e.getValue());
}
k.sortedStrs(rendered);
}
@Override
public int hashCode() {
final int prime = 31;
@@ -2,6 +2,7 @@ package net.coderbot.iris.pipeline.transform.parameter;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import net.coderbot.iris.gl.blending.AlphaTest;
import com.gtnewhorizons.angelica.glsm.shader.ShaderDiskCache;
import com.gtnewhorizons.angelica.glsm.texture.TextureType;
import net.coderbot.iris.helpers.Tri;
import net.coderbot.iris.pipeline.transform.Patch;
@@ -21,6 +22,12 @@ public class TextureStageParameters extends Parameters {
return stage;
}
@Override
public void appendDiskKey(ShaderDiskCache.Key k) {
super.appendDiskKey(k);
k.str(stage == null ? null : stage.name());
}
@Override
public int hashCode() {
final int prime = 31;