Fix managed sampler uniforms breaking on reload

Ladysnake · Jun 6, 2023 · 08251c9 · 08251c9
1 parent 2264247
commit 08251c9
Show file tree

Hide file tree

Showing 84 changed files with 137 additions and 122 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 1.10.1
+------------------------------------------------------
+**Fixes**
+- Fixed managed sampler uniforms losing data upon resource reloading
+
 ------------------------------------------------------
 Version 1.10.0
 ------------------------------------------------------

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.14.11
 fabric_version=0.68.1+1.19.3
 
 # Mod Properties
-mod_version = 1.10.0
+mod_version = 1.10.1
 owners = Ladysnake
 maven_group = io.github.ladysnake
 archives_base_name = satin

diff --git a/src/main/java/ladysnake/satin/Satin.java b/src/main/java/ladysnake/satin/Satin.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,11 +20,7 @@
 import ladysnake.satin.api.event.ResolutionChangeCallback;
 import ladysnake.satin.impl.ReloadableShaderEffectManager;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.resource.ResourceType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apiguardian.api.API;
@@ -48,8 +44,6 @@ public static boolean areShadersDisabled() {
     @Override
     public void onInitializeClient() {
         ResolutionChangeCallback.EVENT.register(ReloadableShaderEffectManager.INSTANCE);
-        // Subscribe the shader manager to MinecraftClient's resource manager to reload shaders like normal assets.
-        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(ReloadableShaderEffectManager.INSTANCE);
         if (FabricLoader.getInstance().isModLoaded("optifabric")) {
             LOGGER.warn("[Satin] Optifine present in the instance, custom entity post process shaders will not work");
         }

diff --git a/src/main/java/ladysnake/satin/api/event/EntitiesPostRenderCallback.java b/src/main/java/ladysnake/satin/api/event/EntitiesPostRenderCallback.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/EntitiesPreRenderCallback.java b/src/main/java/ladysnake/satin/api/event/EntitiesPreRenderCallback.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/PickEntityShaderCallback.java b/src/main/java/ladysnake/satin/api/event/PickEntityShaderCallback.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallback.java b/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallback.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java b/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/ResolutionChangeCallback.java b/src/main/java/ladysnake/satin/api/event/ResolutionChangeCallback.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/ShaderEffectRenderCallback.java b/src/main/java/ladysnake/satin/api/event/ShaderEffectRenderCallback.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/event/package-info.java b/src/main/java/ladysnake/satin/api/event/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java b/src/main/java/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/ManagedCoreShader.java b/src/main/java/ladysnake/satin/api/managed/ManagedCoreShader.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/ManagedFramebuffer.java b/src/main/java/ladysnake/satin/api/managed/ManagedFramebuffer.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/ManagedShaderEffect.java b/src/main/java/ladysnake/satin/api/managed/ManagedShaderEffect.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/ShaderEffectManager.java b/src/main/java/ladysnake/satin/api/managed/ShaderEffectManager.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/package-info.java b/src/main/java/ladysnake/satin/api/managed/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniform.java b/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniform.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java b/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1f.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1f.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1i.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1i.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2f.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2f.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2i.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2i.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3f.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3f.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3i.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3i.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4f.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4f.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4i.java b/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4i.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/UniformFinder.java b/src/main/java/ladysnake/satin/api/managed/uniform/UniformFinder.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/UniformMat4.java b/src/main/java/ladysnake/satin/api/managed/uniform/UniformMat4.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/util/GlMatrices.java b/src/main/java/ladysnake/satin/api/util/GlMatrices.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/util/RenderLayerHelper.java b/src/main/java/ladysnake/satin/api/util/RenderLayerHelper.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/util/ShaderLinkException.java b/src/main/java/ladysnake/satin/api/util/ShaderLinkException.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/util/ShaderLoader.java b/src/main/java/ladysnake/satin/api/util/ShaderLoader.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/util/ShaderPrograms.java b/src/main/java/ladysnake/satin/api/util/ShaderPrograms.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/api/util/package-info.java b/src/main/java/ladysnake/satin/api/util/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/impl/BlockRenderLayerRegistry.java b/src/main/java/ladysnake/satin/impl/BlockRenderLayerRegistry.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/impl/FramebufferWrapper.java b/src/main/java/ladysnake/satin/impl/FramebufferWrapper.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformBase.java b/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformBase.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,10 +30,10 @@
 import java.util.function.IntSupplier;
 
 /**
- * Mojank working in divergent branches for half a century, {@link net.minecraft.client.render.Shader}
- * is a copy of an old implementation of {@link net.minecraft.client.gl.JsonEffectGlShader}.
- * The latter has since been updated to have the {@link net.minecraft.client.gl.JsonEffectGlShader#bindSampler(String, IntSupplier)}
- * while the former still uses {@link net.minecraft.client.render.Shader#addSampler(String, Object)}.
+ * Mojank working in divergent branches for half a century, {@link net.minecraft.client.gl.ShaderProgram}
+ * is a copy of an old implementation of {@link net.minecraft.client.gl.JsonEffectShaderProgram}.
+ * The latter has since been updated to have the {@link net.minecraft.client.gl.JsonEffectShaderProgram#bindSampler(String, IntSupplier)}
+ * while the former still uses {@link net.minecraft.client.gl.ShaderProgram#addSampler(String, Object)}.
  *
  * <p>So we need to deal with both those extremely similar implementations
  */
@@ -60,6 +60,7 @@ public boolean findUniformTargets(List<PostEffectPass> shaders) {
         }
         this.targets = targets.toArray(new SamplerAccess[0]);
         this.locations = rawTargets.toArray(new int[0]);
+        this.syncCurrentValues();
         return this.targets.length > 0;
     }
 
@@ -76,11 +77,22 @@ private boolean findUniformTarget(SamplerAccess access) {
         if (access.satin$hasSampler(this.name)) {
             this.targets = new SamplerAccess[] {access};
             this.locations = new int[] {getSamplerLoc(access)};
+            this.syncCurrentValues();
             return true;
         }
         return false;
     }
 
+    private void syncCurrentValues() {
+        Object value = this.cachedValue;
+        if (value != null) { // after the first upload
+            this.cachedValue = null;
+            this.set(value);
+        }
+    }
+
+    protected abstract void set(Object value);
+
     @Override
     public void setDirect(int activeTexture) {
         int length = this.locations.length;

diff --git a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV1.java b/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV1.java
@@ -1,6 +1,6 @@
 /*
  * Satin
- * Copyright (C) 2019-2022 Ladysnake
+ * Copyright (C) 2019-2023 Ladysnake
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,8 @@ public void set(int textureName) {
         this.set((Object)textureName);
     }
 
-    private void set(Object value) {
+    @Override
+    protected void set(Object value) {
         SamplerAccess[] targets = this.targets;
         if (targets.length > 0 && this.cachedValue != value) {
             for (SamplerAccess target : targets) {