Skip to content

Fix Iris compat leaving Iris's framebuffer bound and drawing to the wrong colortex0 #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CuddlesPrime wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

Fix Iris compat leaving Iris's framebuffer bound and drawing to the wrong colortex0 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions common/src/main/java/foundry/veil/ext/iris/IrisRenderingPipelineExtension.java
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions fabric/src/main/java/foundry/veil/fabric/mixin/compat/iris/IrisRenderingPipelineMixin.java
View file
Open in desktop

This file was deleted.

42 changes: 31 additions & 11 deletions fabric/src/main/java/foundry/veil/fabric/mixin/compat/iris/ShaderWrapperMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,57 @@
package foundry.veil.fabric.mixin.compat.iris;

import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
import foundry.veil.api.client.render.framebuffer.AdvancedFbo;
import foundry.veil.ext.iris.IrisRenderingPipelineExtension;
import com.mojang.blaze3d.platform.GlStateManager;
import foundry.veil.impl.client.render.shader.program.ShaderProgramImpl;
import net.irisshaders.iris.Iris;
import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
import net.irisshaders.iris.shadows.ShadowRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.Optional;

import static org.lwjgl.opengl.GL11C.glGetInteger;
import static org.lwjgl.opengl.GL30C.*;

@Mixin(ShaderProgramImpl.Wrapper.class)
public class ShaderWrapperMixin {

// apply and clear are separate methods, so the framebuffer to restore has to be kept on the shader
@Unique
private int veil$previousReadFramebuffer = -1;
@Unique
private int veil$previousDrawFramebuffer = -1;

@Inject(method = "apply", at = @At("TAIL"))
public void apply(CallbackInfo ci, @Share("drawn") LocalBooleanRef drawnRef) {
public void apply(CallbackInfo ci) {
// Redirect into Iris's buffers the same way Iris does for other shaders it doesn't know: only while it's
// rendering the world (not in GUIs or the shadow pass), and into the copy of colortex0 the pack is using
Optional<WorldRenderingPipeline> pipelineOptional = Iris.getPipelineManager().getPipeline();
if (pipelineOptional.isEmpty() || !(pipelineOptional.get() instanceof IrisRenderingPipelineExtension extension)) {
if (pipelineOptional.isEmpty() || !(pipelineOptional.get() instanceof IrisRenderingPipeline pipeline) || !pipeline.shouldOverrideShaders() || ShadowRenderer.ACTIVE) {
return;
}

drawnRef.set(true);
extension.veil$bindSimpleFramebuffer();
if (this.veil$previousDrawFramebuffer == -1) {
this.veil$previousReadFramebuffer = glGetInteger(GL_READ_FRAMEBUFFER_BINDING);
this.veil$previousDrawFramebuffer = glGetInteger(GL_DRAW_FRAMEBUFFER_BINDING);
}
pipeline.bindDefault();
}

@Inject(method = "clear", at = @At("TAIL"))
public void clear(CallbackInfo ci, @Share("drawn") LocalBooleanRef drawnRef) {
if (drawnRef.get()) {
AdvancedFbo.unbind();
public void clear(CallbackInfo ci) {
if (this.veil$previousDrawFramebuffer == -1) {
return;
}

// Restore whatever was bound before, which isn't always the main framebuffer (e.g. Iris's own while in the world)
GlStateManager._glBindFramebuffer(GL_READ_FRAMEBUFFER, this.veil$previousReadFramebuffer);
GlStateManager._glBindFramebuffer(GL_DRAW_FRAMEBUFFER, this.veil$previousDrawFramebuffer);
this.veil$previousReadFramebuffer = -1;
this.veil$previousDrawFramebuffer = -1;
}
}
1 change: 0 additions & 1 deletion fabric/src/main/resources/veil.fabric.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"compat.imguimc.KeyboardHandlerMixin",
"compat.imguimc.MouseHandlerMixin",
"compat.iris.IrisRenderingPipelineAccessor",
"compat.iris.IrisRenderingPipelineMixin",
"compat.iris.IrisRenderTargetMixin",
"compat.iris.ShaderWrapperMixin",
"compat.replaymod.PipelineMixin",
Expand Down
50 changes: 0 additions & 50 deletions neoforge/src/main/java/foundry/veil/forge/mixin/compat/iris/IrisRenderingPipelineMixin.java
View file
Open in desktop

This file was deleted.

42 changes: 31 additions & 11 deletions neoforge/src/main/java/foundry/veil/forge/mixin/compat/iris/ShaderWrapperMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,57 @@
package foundry.veil.forge.mixin.compat.iris;

import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
import foundry.veil.api.client.render.framebuffer.AdvancedFbo;
import foundry.veil.ext.iris.IrisRenderingPipelineExtension;
import com.mojang.blaze3d.platform.GlStateManager;
import foundry.veil.impl.client.render.shader.program.ShaderProgramImpl;
import net.irisshaders.iris.Iris;
import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
import net.irisshaders.iris.shadows.ShadowRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.Optional;

import static org.lwjgl.opengl.GL11C.glGetInteger;
import static org.lwjgl.opengl.GL30C.*;

@Mixin(ShaderProgramImpl.Wrapper.class)
public class ShaderWrapperMixin {

// apply and clear are separate methods, so the framebuffer to restore has to be kept on the shader
@Unique
private int veil$previousReadFramebuffer = -1;
@Unique
private int veil$previousDrawFramebuffer = -1;

@Inject(method = "apply", at = @At("TAIL"))
public void apply(CallbackInfo ci, @Share("drawn") LocalBooleanRef drawnRef) {
public void apply(CallbackInfo ci) {
// Redirect into Iris's buffers the same way Iris does for other shaders it doesn't know: only while it's
// rendering the world (not in GUIs or the shadow pass), and into the copy of colortex0 the pack is using
Optional<WorldRenderingPipeline> pipelineOptional = Iris.getPipelineManager().getPipeline();
if (pipelineOptional.isEmpty() || !(pipelineOptional.get() instanceof IrisRenderingPipelineExtension extension)) {
if (pipelineOptional.isEmpty() || !(pipelineOptional.get() instanceof IrisRenderingPipeline pipeline) || !pipeline.shouldOverrideShaders() || ShadowRenderer.ACTIVE) {
return;
}

drawnRef.set(true);
extension.veil$bindSimpleFramebuffer();
if (this.veil$previousDrawFramebuffer == -1) {
this.veil$previousReadFramebuffer = glGetInteger(GL_READ_FRAMEBUFFER_BINDING);
this.veil$previousDrawFramebuffer = glGetInteger(GL_DRAW_FRAMEBUFFER_BINDING);
}
pipeline.bindDefault();
}

@Inject(method = "clear", at = @At("TAIL"))
public void clear(CallbackInfo ci, @Share("drawn") LocalBooleanRef drawnRef) {
if (drawnRef.get()) {
AdvancedFbo.unbind();
public void clear(CallbackInfo ci) {
if (this.veil$previousDrawFramebuffer == -1) {
return;
}

// Restore whatever was bound before, which isn't always the main framebuffer (e.g. Iris's own while in the world)
GlStateManager._glBindFramebuffer(GL_READ_FRAMEBUFFER, this.veil$previousReadFramebuffer);
GlStateManager._glBindFramebuffer(GL_DRAW_FRAMEBUFFER, this.veil$previousDrawFramebuffer);
this.veil$previousReadFramebuffer = -1;
this.veil$previousDrawFramebuffer = -1;
}
}
1 change: 0 additions & 1 deletion neoforge/src/main/resources/veil.neoforge.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"client.perspective.sodium.SodiumWorldRendererMixin",
"client.perspective.vanilla.LevelRendererMixin",
"compat.iris.IrisRenderingPipelineAccessor",
"compat.iris.IrisRenderingPipelineMixin",
"compat.iris.IrisRenderTargetMixin",
"compat.iris.ShaderWrapperMixin",
"compat.sodium.BlockRendererMixin",
Expand Down