Skip to content

draw translucent features before deferred, if separateEntityDraws is false #3151

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
fayer3 wants to merge 1 commit into
base: 26.1
Choose a base branch
from
+19 −7
Open

draw translucent features before deferred, if separateEntityDraws is false #3151

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
13 changes: 11 additions & 2 deletions common/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import net.irisshaders.iris.pathways.HandRenderer;
import net.irisshaders.iris.pipeline.WorldRenderingPhase;
import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
import net.irisshaders.iris.shaderpack.materialmap.WorldRenderingSettings;
import net.irisshaders.iris.shadows.frustum.fallback.NonCullingFrustum;
import net.irisshaders.iris.uniforms.CapturedRenderingState;
import net.irisshaders.iris.uniforms.IrisTimeUniforms;
Expand All @@ -42,6 +43,7 @@
import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.LevelTargetBundle;
import net.minecraft.client.renderer.RenderBuffers;
import net.minecraft.client.renderer.feature.FeatureRenderDispatcher;
import net.minecraft.client.renderer.rendertype.RenderType;
import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
import net.minecraft.client.renderer.chunk.ChunkSectionLayerGroup;
Expand Down Expand Up @@ -274,11 +276,18 @@ private void skip(CommandEncoder instance, GpuTexture texture, double v, Operati
}

// TODO this needs to be more consistent.
@Inject(method = { MojLambdas.RENDER_MAIN_PASS, NeoLambdas.NEO_RENDER_MAIN_PASS }, require = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/feature/FeatureRenderDispatcher;renderTranslucentFeatures()V"))
private void iris$beginTranslucents(CallbackInfo ci, @Local(ordinal = 0, argsOnly = true) Matrix4fc modelMatrix) {
@WrapOperation(method = { MojLambdas.RENDER_MAIN_PASS, NeoLambdas.NEO_RENDER_MAIN_PASS }, require = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/feature/FeatureRenderDispatcher;renderTranslucentFeatures()V"))
private void iris$beginTranslucents(FeatureRenderDispatcher instance, Operation<Void> original, @Local(ordinal = 0, argsOnly = true) Matrix4fc modelMatrix) {
if (!WorldRenderingSettings.INSTANCE.shouldSeparateEntityDraws()) {
original.call(instance);
this.renderBuffers.bufferSource().endBatch();
}
pipeline.beginHand();
HandRenderer.INSTANCE.renderSolid(modelMatrix, Minecraft.getInstance().getDeltaTracker().getGameTimeDeltaPartialTick(true), Minecraft.getInstance().gameRenderer.getMainCamera(), levelRenderState.cameraRenderState, Minecraft.getInstance().gameRenderer, pipeline);
Profiler.get().popPush("iris_pre_translucent");
pipeline.beginTranslucents();
if (WorldRenderingSettings.INSTANCE.shouldSeparateEntityDraws()) {
original.call(instance);
}
}
}
6 changes: 4 additions & 2 deletions common/src/main/java/net/irisshaders/iris/pipeline/IrisRenderingPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,11 @@ public IrisRenderingPipeline(ProgramSet programSet) {
.map(ImageClearPass::create)
.collect(ImmutableList.toImmutableList());

boolean separateEntityDraws = programSet.getPackDirectives().shouldUseSeparateEntityDraws().orElse(programSet.get(ProgramId.EntitiesTrans).isPresent() || programSet.get(ProgramId.BlockTrans).isPresent());

if (programSet.getPackDirectives().getParticleRenderingSettings() != ParticleRenderingSettings.UNSET) {
this.particleRenderingSettings = programSet.getPackDirectives().getParticleRenderingSettings();
} else if (programSet.getComposite(ProgramArrayId.Deferred).length > 0 && !programSet.getPackDirectives().shouldUseSeparateEntityDraws()) {
} else if (programSet.getComposite(ProgramArrayId.Deferred).length > 0 && !separateEntityDraws) {
this.particleRenderingSettings = ParticleRenderingSettings.AFTER;
} else {
this.particleRenderingSettings = ParticleRenderingSettings.MIXED;
Expand Down Expand Up @@ -446,7 +448,7 @@ public IrisRenderingPipeline(ProgramSet programSet) {
WorldRenderingSettings.INSTANCE.setUseSeparateAo(programSet.getPackDirectives().shouldUseSeparateAo());
WorldRenderingSettings.INSTANCE.setBreaksAnisotropy(programSet.getPackDirectives().breaksAnisotropy());
WorldRenderingSettings.INSTANCE.setVoxelizeLightBlocks(programSet.getPackDirectives().shouldVoxelizeLightBlocks());
WorldRenderingSettings.INSTANCE.setSeparateEntityDraws(programSet.getPackDirectives().shouldUseSeparateEntityDraws());
WorldRenderingSettings.INSTANCE.setSeparateEntityDraws(separateEntityDraws);

if (shadowRenderTargets != null) {
GlProgram shader = shaderMap.getShader(ShaderKey.SHADOW_TERRAIN_CUTOUT);
Expand Down
7 changes: 4 additions & 3 deletions common/src/main/java/net/irisshaders/iris/shaderpack/properties/PackDirectives.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.irisshaders.iris.Iris;
import net.irisshaders.iris.gl.texture.TextureScaleOverride;
import net.irisshaders.iris.gl.texture.TextureType;
import net.irisshaders.iris.helpers.OptionalBoolean;
import net.irisshaders.iris.helpers.Tri;
import net.irisshaders.iris.shaderpack.parsing.DirectiveHolder;
import net.irisshaders.iris.shaderpack.texture.TextureStage;
Expand Down Expand Up @@ -41,7 +42,7 @@ public class PackDirectives {
private boolean separateAo;
private boolean breaksAnisotropy;
private boolean voxelizeLightBlocks;
private boolean separateEntityDraws;
private OptionalBoolean separateEntityDraws;
private boolean skipAllRendering;
private boolean frustumCulling;
private boolean supportsEndFlash;
Expand Down Expand Up @@ -84,7 +85,7 @@ public PackDirectives(Set<Integer> supportedRenderTargets, ShaderProperties prop
separateAo = properties.getSeparateAo().orElse(false);
breaksAnisotropy = properties.breaksAnisotropy().orElse(false);
voxelizeLightBlocks = properties.getVoxelizeLightBlocks().orElse(false);
separateEntityDraws = properties.getSeparateEntityDraws().orElse(false);
separateEntityDraws = properties.getSeparateEntityDraws();
skipAllRendering = properties.skipAllRendering().orElse(false);
frustumCulling = properties.getFrustumCulling().orElse(true);
supportsEndFlash = properties.supportsEndFlash().orElse(false);
Expand Down Expand Up @@ -212,7 +213,7 @@ public boolean shouldVoxelizeLightBlocks() {
return voxelizeLightBlocks;
}

public boolean shouldUseSeparateEntityDraws() {
public OptionalBoolean shouldUseSeparateEntityDraws() {
return separateEntityDraws;
}

Expand Down
Loading