diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/PlayerReflectionCapture.java b/src/main/java/com/gtnewhorizons/angelica/rendering/PlayerReflectionCapture.java index c3a417d05..014fe7163 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/PlayerReflectionCapture.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/PlayerReflectionCapture.java @@ -10,7 +10,6 @@ import com.gtnewhorizons.angelica.glsm.profiling.Tracy; import com.gtnewhorizons.angelica.glsm.texture.TextureInfo; import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache; import com.gtnewhorizons.angelica.mixins.interfaces.ModelBoxQuads; -import com.gtnewhorizons.angelica.rendering.tesr.PassRebindGate; import lombok.Getter; import net.coderbot.iris.Iris; import net.coderbot.iris.gl.image.GlImage; @@ -211,8 +210,8 @@ public final class PlayerReflectionCapture { final float[] xyzuv = vertexScratch; if (xyzuv == null || xyzuv.length < VERTEX_COUNT * FLOATS_PER_VERTEX) return; - PassRebindGate.rebindIfDirty(); if (!(Iris.getPipelineManager().getPipelineNullable() instanceof DeferredWorldRenderingPipeline pipeline)) return; + pipeline.rebindCurrentPass(); if (GLStateManager.getActiveProgram() != pipeline.getActivePassProgramId()) return; if (Tracy.ENABLED) Tracy.beginZone(Z_PLAYER_REFLECTION_FLUSH); diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java index 37299f8f9..762476718 100644 --- a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java @@ -617,8 +617,8 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R () -> usesSampler(IrisSamplers.USAGE_SHADOWTEX1)); Program shadowProgram = table.match(RenderCondition.SHADOW, SHADOW_INPUTS).getProgram(); Program shadowWaterProgram = table.match(RenderCondition.SHADOW_TRANSLUCENT, SHADOW_INPUTS).getProgram(); - shadowRenderer.setUsesImages((shadowProgram != null && shadowProgram.getActiveImages() > 0) || (shadowWaterProgram != null && shadowWaterProgram.getActiveImages() > 0)); - shadowRenderer.setPlayerReflectionCaptureEnabled((shadowProgram != null && GLStateManager.glGetUniformLocation(shadowProgram.getProgramId(), "playerAtlas_img") != -1) || (shadowWaterProgram != null && GLStateManager.glGetUniformLocation(shadowWaterProgram.getProgramId(), "playerAtlas_img") != -1)); + shadowRenderer.setUsesImages(usesImages(shadowProgram) || usesImages(shadowWaterProgram)); + shadowRenderer.setPlayerReflectionCaptureEnabled(usesImage(shadowProgram, "playerAtlas_img") || usesImage(shadowWaterProgram, "playerAtlas_img")); } else { shadowRenderer = null; } @@ -1591,6 +1591,14 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R return supportsInstancing[kind.ordinal()]; } + private boolean usesImages(@Nullable Program program) { + return program != null && (program.getActiveImages() > 0 || vertexWriteReplays.writesImages(program)); + } + + private boolean usesImage(@Nullable Program program, String image) { + return program != null && (GLStateManager.glGetUniformLocation(program.getProgramId(), image) != -1 || vertexWriteReplays.writesImage(program, image)); + } + @Override public boolean hasInstancedVariant(Instancing kind) { return current != null && current.instancedVariant(kind) != null; diff --git a/src/main/java/net/coderbot/iris/pipeline/VertexWriteReplays.java b/src/main/java/net/coderbot/iris/pipeline/VertexWriteReplays.java index 3acac26bf..971fa73ec 100644 --- a/src/main/java/net/coderbot/iris/pipeline/VertexWriteReplays.java +++ b/src/main/java/net/coderbot/iris/pipeline/VertexWriteReplays.java @@ -5,7 +5,9 @@ import com.gtnewhorizons.angelica.glsm.backend.BackendManager; import com.gtnewhorizons.angelica.glsm.backend.VertexWriteReplaySetup; import com.gtnewhorizons.angelica.glsm.texture.InternalTextureFormat; import com.gtnewhorizons.angelica.glsm.texture.TextureType; -import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +import it.unimi.dsi.fastutil.ints.IntIterator; import net.coderbot.iris.Iris; import net.coderbot.iris.gl.image.ImageHolder; import net.coderbot.iris.gl.program.ComputeProgram; @@ -33,10 +35,20 @@ import java.util.function.IntSupplier; final class VertexWriteReplays { private final List twins = new ArrayList<>(); - private final IntArrayList attachedPrograms = new IntArrayList(); + private final Int2ObjectMap> writtenImagesByProgram = new Int2ObjectOpenHashMap<>(); + + boolean writesImage(Program program, String image) { + final List images = writtenImagesByProgram.get(program.getProgramId()); + return images != null && images.contains(image); + } + + boolean writesImages(Program program) { + return writtenImagesByProgram.containsKey(program.getProgramId()); + } void attach(String name, Program program, Map transformed, BiConsumer wireResources) { BackendManager.RENDER_BACKEND.setVertexWriteReplay(program.getProgramId(), null); + writtenImagesByProgram.remove(program.getProgramId()); final String source = transformed.get(PatchShaderType.COMPUTE); if (RwImageStoreExtractor.parseSentinel(source) != RwImageStoreExtractor.RwExtractMode.VERTEX_REPLAY) return; @@ -76,13 +88,13 @@ final class VertexWriteReplays { inputNames, inputLocations, resources.images, writtenImages.size(), resources.samplerNames.toArray(new String[0]), resources.samplerUnits, resources.samplerTextures, resources.samplerObjects, RwImageStoreExtractor.VG_REPLAY_VERTEX_BUFFER_BINDING, RwImageStoreExtractor.VG_REPLAY_VERTEX_BUFFER_COUNT, RwImageStoreExtractor.VG_REPLAY_INDEX_BUFFER_BINDING)); - attachedPrograms.add(program.getProgramId()); + writtenImagesByProgram.put(program.getProgramId(), writtenImages); twins.add(twin); } void destroy() { - for (int i = 0; i < attachedPrograms.size(); i++) BackendManager.RENDER_BACKEND.setVertexWriteReplay(attachedPrograms.getInt(i), null); - attachedPrograms.clear(); + for (IntIterator it = writtenImagesByProgram.keySet().iterator(); it.hasNext(); ) BackendManager.RENDER_BACKEND.setVertexWriteReplay(it.nextInt(), null); + writtenImagesByProgram.clear(); for (ComputeProgram twin : twins) twin.destroy(); twins.clear(); }