Fix stale uniforms when switching shader program (#1715)

This commit is contained in:
Kotmatross authored and GitHub committed 2026-05-03 14:30:46 -07:00
1 parent 155f209db5
commit 7e44c1efcb
7 files changed
+48 -31

No files matched your search

@@ -1,12 +1,19 @@
package net.coderbot.iris.gl.program;
import lombok.Getter;
import net.coderbot.iris.gl.GlResource;
import net.coderbot.iris.gl.blending.DepthColorStorage;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
public final class Program extends GlResource {
@Getter
private final ProgramUniforms uniforms;
@Getter
private final ProgramSamplers samplers;
@Getter
private final ProgramImages images;
Program(int program, ProgramUniforms uniforms, ProgramSamplers samplers, ProgramImages images) {
@@ -18,15 +25,15 @@ public final class Program extends GlResource {
DepthColorStorage.registerOwnedProgram(program);
}
public void use() {
GLStateManager.glUseProgram(getGlId());
uniforms.update();
samplers.update();
images.update();
}
public static void unbind() {
ProgramUniforms.clearActiveUniforms();
ProgramSamplers.clearActiveSamplers();
@@ -38,12 +45,7 @@ public final class Program extends GlResource {
DepthColorStorage.unregisterOwnedProgram(getGlId());
GLStateManager.glDeleteProgram(getGlId());
}
/**
* @return the OpenGL ID of this program.
* @deprecated this should be encapsulated eventually
*/
@Deprecated
public int getProgramId() {
return getGlId();
}
@@ -181,9 +181,7 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
private final boolean allowConcurrentCompute;
private final OptionalInt forcedShadowRenderDistanceChunks;
private final CloudSetting dhCloudSetting;
private Pass current = null;
private WorldRenderingPhase overridePhase = null;
private WorldRenderingPhase phase = WorldRenderingPhase.NONE;
private boolean isBeforeTranslucent;
@@ -769,7 +767,11 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
public boolean shouldOverrideShaders() {
return isRenderingWorld && !isRenderingFullScreenPass && !isPostChain && isMainBound;
}
public Pass getActivePassProgram() {
return current;
}
public int getActivePassProgramId() {
if (current == null) return -1;
final Program p = current.getProgram();
@@ -1050,7 +1052,7 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
return shadowRenderTargets != null;
}
private final class Pass {
public final class Pass {
@Nullable
private final Program program;
private final GlFramebuffer framebufferBeforeTranslucents;
@@ -1,9 +0,0 @@
package net.coderbot.iris.vertices;
/**
* Some annoying global state needed for the extended vertex format disabling optimization.
*/
public class ImmediateState {
public static boolean isRenderingLevel = false;
public static boolean renderWithExtendedVertexFormat = true;
}