Skip to content

Update sodium compat #146

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

Merged
Awakened-Redstone merged 5 commits into from
Jul 16, 2026
Merged

Update sodium compat #146

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f317a20
Update modmenu and sodium deps
ekulxam Jul 13, 2026
330a9de
Fixin mixes
ekulxam Jul 14, 2026
90c9172
Please compile
ekulxam Jul 14, 2026
e3fadf9
Consistency
ekulxam Jul 14, 2026
759ca86
Doesn't crash anymore
ekulxam Jul 14, 2026
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dependencies {
localRuntime(libs.modmenu)

compileOnly(libs.sodium)
// localRuntime(libs.sodium)
localRuntime(libs.sodium)
}

loom {
Expand Down
4 changes: 2 additions & 2 deletions libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ placeholder = "3.0.0-beta.2+26.1"
#polydex = "1.8.1+1.21.11"
# emi = "1.1.19+1.21.1"
rrv = "8.1.1+26.1.2"
modmenu = "18.0.0-alpha.6"
sodium = "0.8.9+mc26.1.1"
modmenu = "18.0.0"
sodium = "0.9.1+mc26.1.2"

[plugins]
loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/dev/hephaestus/glowcase/client/sodium/BakedBESortingTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ public BakedBESortingTask(RenderSection section, int time, Vector3dc absoluteCam
super(section, time, absoluteCameraPos);
this.levelRenderer = GlowcaseLevelRenderer.getInstance();
this.sectionInfo = sectionInfo;
this.sectionNode = render.getPosition().asLong();
this.sectionNode = this.section.getPosition().asLong();
}

@Override
public Output execute(ChunkBuildContext context, CancellationToken cancellationToken) {
if (cancellationToken.isCancelled() || isGone()) return null;

GlowcaseSectionRenderDispatcher renderDispatcher = levelRenderer.getSectionRenderDispatcher();
GlowcaseSectionRenderDispatcher renderDispatcher = this.levelRenderer.getSectionRenderDispatcher();
if (renderDispatcher == null) return null;

ProfilerFiller profiler = Profiler.get();
Expand All @@ -53,7 +53,7 @@ public Output execute(ChunkBuildContext context, CancellationToken cancellationT
ByteBufferBuilder bufferBuilder = indexBufferPool.acquire();

int size = 0;
for (GlowcaseRenderSectionInfo.DrawEntry entry : sectionInfo) {
for (GlowcaseRenderSectionInfo.DrawEntry entry : this.sectionInfo) {
final var sorter = entry.sorter();
if (sorter == null) continue;

Expand All @@ -71,7 +71,7 @@ public Output execute(ChunkBuildContext context, CancellationToken cancellationT
return null;
}

success = renderDispatcher.allocateIndexBuffers(sectionNode, entry.renderType(), indexBuffer.byteBuffer());
success = renderDispatcher.allocateIndexBuffers(this.sectionNode, entry.renderType(), indexBuffer.byteBuffer());

if (!success && !RenderSystem.isOnRenderThread()) {
Thread.onSpinWait();
Expand All @@ -82,31 +82,31 @@ public Output execute(ChunkBuildContext context, CancellationToken cancellationT
indexBuffer.close();
}

sectionInfo.setTranslucencyPointOfView(absoluteCameraPos.get(new Vector3f()), sectionNode);
this.sectionInfo.setTranslucencyPointOfView(this.absoluteCameraPos.get(new Vector3f()), this.sectionNode);

// Only clear after. There is no need to do it every iteration, it has 4GiB of capacity.
// If this runs out, there is a much bigger problem to be solved.
bufferBuilder.clear();
indexBufferPool.release(bufferBuilder);
profiler.pop();

return new Output(render, submitTime, size);
return new Output(this.section, this.submitTime, size);
}

@Override
public long estimateTaskSizeWith(MeshTaskSizeEstimator estimator) {
if (isGone()) return 0;
if (this.isGone()) return 0;

int size = 0;
for (GlowcaseRenderSectionInfo.DrawEntry entry : sectionInfo) {
for (GlowcaseRenderSectionInfo.DrawEntry entry : this.sectionInfo) {
size += TranslucentData.quadCountToIndexBytes(entry.indexCount());
}

return size;
}

private boolean isGone() {
return !levelRenderer.visibleSections().isVisible(sectionNode);
return !this.levelRenderer.visibleSections().isVisible(this.sectionNode);
}

public static BakedBESortingTask create(RenderSection section, int frame, Vector3dc absoluteCameraPos) {
Expand All @@ -125,7 +125,7 @@ public Output(RenderSection render, int buildTime, int size) {

@Override
protected long calculateResultSize() {
return size;
return this.size;
}
}
}
6 changes: 3 additions & 3 deletions ...ava/dev/hephaestus/glowcase/mixin/client/bakedbe/sodium/ChunkBuilderMeshingTaskMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ private <E extends BlockEntity, B extends BlockEntityRenderState> void submitBak
}
}

@Inject(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/data/BuiltSectionInfo$Builder;setOcclusionData(Lnet/minecraft/client/renderer/chunk/VisibilitySet;)V", shift = At.Shift.AFTER), method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;")
@Inject(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/data/BuiltSectionInfo$Builder;setOcclusionData([Lnet/minecraft/client/renderer/chunk/VisibilitySet;)V", shift = At.Shift.AFTER), method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;")
private void queueCompilation(
CallbackInfoReturnable<SectionCompiler.Results> cir,
@Share("nodeStorage") LocalRef<SubmitNodeStorage> nodeStorageRef,
@Share("vertexSorting") LocalRef<VertexSorting> vertexSortingRef,
@Share("bakedMeshes") LocalRef<BakedMeshes> bakedMeshes
) {
bakedMeshes.set(GlowcaseLevelRenderer.getInstance().updateAndCompile(this.render.getPosition().asLong(), nodeStorageRef.get(), vertexSortingRef.get()));
bakedMeshes.set(GlowcaseLevelRenderer.getInstance().updateAndCompile(this.section.getPosition().asLong(), nodeStorageRef.get(), vertexSortingRef.get()));
}

@Expression("return null")
Expand All @@ -164,7 +164,7 @@ private void allocateBuffers(
) {
GlowcaseLevelRenderer levelRenderer = GlowcaseLevelRenderer.getInstance();
BakedMeshes meshes = bakedMeshesRef.get();
long sectionNode = render.getPosition().asLong();
long sectionNode = this.section.getPosition().asLong();
if (meshes == null) {
levelRenderer.releaseSection(sectionNode);
return;
Expand Down
10 changes: 4 additions & 6 deletions ...ava/dev/hephaestus/glowcase/mixin/client/bakedbe/sodium/ChunkBuilderSortingTaskMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package dev.hephaestus.glowcase.mixin.client.bakedbe.sodium;

import com.llamalad7.mixinextras.sugar.Local;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.ByteBufferBuilder;
import com.mojang.blaze3d.vertex.VertexSorting;
Expand Down Expand Up @@ -32,17 +30,16 @@ public ChunkBuilderSortingTaskMixin(RenderSection render, int time, Vector3dc ab
super(render, time, absoluteCameraPos);
}

@Inject(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/translucent_sorting/data/DynamicSorter;writeIndexBuffer(Lnet/caffeinemc/mods/sodium/client/render/chunk/translucent_sorting/data/CombinedCameraPos;Z)V"), method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkSortOutput;")
@Inject(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/translucent_sorting/data/DynamicSorter;writeIndexBuffer(Lnet/caffeinemc/mods/sodium/client/render/chunk/translucent_sorting/data/CombinedCameraPos;)V"), method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkSortOutput;", cancellable = true)
private void handleResorting(
ChunkBuildContext context,
CancellationToken cancellationToken,
CallbackInfoReturnable<ChunkSortOutput> cir,
@Local(name = "profiler") ProfilerFiller profiler,
@Share("resort") LocalRef<Boolean> shouldResort
@Local(name = "profiler") ProfilerFiller profiler
) {
GlowcaseLevelRenderer levelRenderer = GlowcaseLevelRenderer.getInstance();
var visibleSections = levelRenderer.visibleSections();
long sectionNode = render.getPosition().asLong();
long sectionNode = this.section.getPosition().asLong();
if (!visibleSections.isVisible(sectionNode)) return;
profiler.push("baked_be");

Expand All @@ -64,6 +61,7 @@ private void handleResorting(

while (!success) {
if (cancellationToken.isCancelled()) {
// In theory, this would never be reached - SkyNotTheLimit

@Awakened-Redstone Awakened-Redstone Jul 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spamming F3 + A is an edge case and race condition nightmare

@ekulxam ekulxam Jul 14, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was more of a comment of where we happen to inject. Since the target method returns early if the cancellationToken was cancelled, then that statement should never be triggered, and I don't think it ever has, because the handler was not marked as cancellable even thought we call CallbackInfoReturnable#setReturnValue

@Awakened-Redstone Awakened-Redstone Jul 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since it has to wait for the buffer queue to free space if there isn't enough, it is possible that it gets cancelled while waiting
I just have never been able to fill the index buffer queue

@ekulxam ekulxam Jul 14, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see what you mean now
Would you like me to remove the comment?

@ekulxam ekulxam Jul 14, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I'm fairly sure I was correct in marking the injector as cancellable, unless you want me to revert that too.

@Awakened-Redstone Awakened-Redstone Jul 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I'm fairly sure I was correct in marking the injector as cancellable, unless you want me to revert that too.

The cancellable is fine, I missed it when working on the fixes

indexBuffer.close();
bufferBuilder.clear();
BakedBESortingTask.indexBufferPool.release(bufferBuilder);
Expand Down
1 change: 0 additions & 1 deletion src/main/java/dev/hephaestus/glowcase/mixin/client/bakedbe/sodium/EntityRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import dev.hephaestus.glowcase.client.sodium.AsyncEntityRenderer;
import net.caffeinemc.mods.sodium.api.util.ColorARGB;
import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
import net.caffeinemc.mods.sodium.client.render.immediate.model.EntityRenderer;
import net.caffeinemc.mods.sodium.client.render.immediate.model.ModelCuboid;
Expand Down
17 changes: 9 additions & 8 deletions ...n/java/dev/hephaestus/glowcase/mixin/client/bakedbe/sodium/RenderSectionManagerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import dev.hephaestus.glowcase.client.render.bakedbe.level.GlowcaseLevelRenderer;
import dev.hephaestus.glowcase.client.sodium.BakedBESortingTask;
import dev.hephaestus.glowcase.mixinsupport.sodium.RenderSectionManagerExtension;
import it.unimi.dsi.fastutil.longs.Long2ReferenceMap;
import net.caffeinemc.mods.sodium.client.render.chunk.ChunkUpdateTypes;
import net.caffeinemc.mods.sodium.client.render.chunk.RenderSection;
import net.caffeinemc.mods.sodium.client.render.chunk.RenderSectionManager;
Expand All @@ -19,6 +18,7 @@
import net.caffeinemc.mods.sodium.client.render.chunk.compile.estimation.UploadDurationEstimator;
import net.caffeinemc.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderSortingTask;
import net.caffeinemc.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderTask;
import net.caffeinemc.mods.sodium.client.render.chunk.storage.SectionStorage;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.joml.Vector3dc;
Expand All @@ -42,20 +42,21 @@ public abstract class RenderSectionManagerMixin implements RenderSectionManagerE
@Shadow private @Final JobDurationEstimator jobDurationEstimator;
@Shadow private @Final MeshTaskSizeEstimator meshTaskSizeEstimator;
@Shadow private @Final UploadDurationEstimator jobUploadDurationEstimator;
@Shadow private @Final Long2ReferenceMap<RenderSection> sectionByPosition;
@Shadow private @Final SectionStorage renderSections;
@Shadow private @Nullable Vector3dc cameraPosition;
@Shadow private int frame;

@Shadow protected abstract boolean shouldPrioritizeTask(RenderSection section, float distance);
@Shadow protected abstract boolean upgradePendingUpdate(RenderSection section, int updateType);

@Inject(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobResult;successfully(Ljava/lang/Object;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobResult;"), method = "submitSectionTask")
@Inject(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobResult;successfully(Ljava/lang/Object;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobResult;"), method = "submitSectionTask(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobCollector;Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;ILnet/caffeinemc/mods/sodium/client/render/chunk/compile/estimation/UploadResourceBudget;Z)V")
private void clearEmptySection(CallbackInfo ci, @Local(argsOnly = true, name = "section") RenderSection section) {
GlowcaseLevelRenderer.getInstance().updateAndCompile(section.getPosition().asLong(), null, null);
}

@Override
public void glowcase$scheduleBakedBESort(long sectionPos) {
RenderSection section = this.sectionByPosition.get(sectionPos);
RenderSection section = this.renderSections.getConsistent(sectionPos); // TODO: check

if (section != null) {
int pendingUpdate = BAKED_BE_SORT;
Expand All @@ -67,7 +68,7 @@ private void clearEmptySection(CallbackInfo ci, @Local(argsOnly = true, name = "
}
}

@WrapOperation(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSectionManager;createSortTask(Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;I)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/tasks/ChunkBuilderSortingTask;"), method = "submitSectionTask")
@WrapOperation(at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSectionManager;createSortTask(Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;I)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/tasks/ChunkBuilderSortingTask;"), method = "submitSectionTask(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobCollector;Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;ILnet/caffeinemc/mods/sodium/client/render/chunk/compile/estimation/UploadResourceBudget;Z)V")
private ChunkBuilderSortingTask checkIfBakedBEResort(
RenderSectionManager instance,
RenderSection render,
Expand All @@ -80,7 +81,7 @@ private ChunkBuilderSortingTask checkIfBakedBEResort(

@Definition(id = "createSortTask", method = "Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSectionManager;createSortTask(Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;I)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/tasks/ChunkBuilderSortingTask;")
@Expression("? = ?.createSortTask(?, ?)")
@Inject(at = @At(value = "MIXINEXTRAS:EXPRESSION", shift = At.Shift.AFTER), method = "submitSectionTask")
@Inject(at = @At(value = "MIXINEXTRAS:EXPRESSION", shift = At.Shift.AFTER), method = "submitSectionTask(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobCollector;Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;ILnet/caffeinemc/mods/sodium/client/render/chunk/compile/estimation/UploadResourceBudget;Z)V")
private void createBakedBESortTask(
CallbackInfo ci,
@Local(argsOnly = true, name = "type") int type,
Expand All @@ -89,11 +90,11 @@ private void createBakedBESortTask(
) {
if (task.get() != null || (type & BAKED_BE_SORT) == 0) return;

task.set(createBakedBESortTask(section, this.frame));
task.set(glowcase$createBakedBESortTask(section, this.frame));
}

@Unique
public BakedBESortingTask createBakedBESortTask(RenderSection render, int frame) {
public BakedBESortingTask glowcase$createBakedBESortTask(RenderSection render, int frame) {
var task = BakedBESortingTask.create(render, frame, this.cameraPosition);
if (task != null) {
task.calculateEstimations(this.jobDurationEstimator, this.meshTaskSizeEstimator, this.jobUploadDurationEstimator);
Expand Down
15 changes: 7 additions & 8 deletions ...bakedbe/sodium/SectionCollectorMixin.java → ...be/sodium/VisibleChunkCollectorMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import dev.hephaestus.glowcase.client.render.bakedbe.level.GlowcaseLevelRenderer;
import dev.hephaestus.glowcase.client.render.bakedbe.level.VisibleSections;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import net.caffeinemc.mods.sodium.client.render.chunk.RenderSection;
import net.caffeinemc.mods.sodium.client.render.chunk.lists.RenderListProvider;
import net.caffeinemc.mods.sodium.client.render.chunk.lists.SectionCollector;
import net.caffeinemc.mods.sodium.client.render.chunk.lists.SortedRenderLists;
import net.caffeinemc.mods.sodium.client.render.chunk.lists.VisibleChunkCollector;
import net.caffeinemc.mods.sodium.client.render.chunk.region.RenderRegion;
import net.caffeinemc.mods.sodium.client.render.viewport.Viewport;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
Expand All @@ -20,17 +20,16 @@

@SuppressWarnings("JavadocDeclaration")
@Environment(EnvType.CLIENT)
@Mixin(SectionCollector.class)
public abstract class SectionCollectorMixin implements RenderListProvider {
@Mixin(VisibleChunkCollector.class)
public abstract class VisibleChunkCollectorMixin implements RenderListProvider {
// We can't tell how big this will be, so we'll just use the last size
private final @Unique LongArrayList sortedSections = new LongArrayList(GlowcaseLevelRenderer.getInstance().visibleSections().indexSize());

@Inject(at = @At("RETURN"), method = "visit(Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;I)V")
private void addSectionPos(RenderSection section, int flags, CallbackInfo ci) {
sortedSections.add(section.getPosition().asLong());
@Inject(at = @At("RETURN"), method = "visit")
private void addSectionPos(int x, int y, int z, CallbackInfo ci) {
sortedSections.add(RenderRegion.key(x, y, z));
}


/**
* @author Luna (Awakened Redstone)
* @reason Add hook for finalized section resort
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/glowcase.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"client.bakedbe.sodium.PoseAccessor",
"client.bakedbe.sodium.RenderSectionManagerMixin",
"client.bakedbe.sodium.RenderSectionMixin",
"client.bakedbe.sodium.SectionCollectorMixin",
"client.bakedbe.sodium.VisibleChunkCollectorMixin",
"client.bakedbe.sodium.SodiumWorldRendererAccessor",
"client.sound.SoundEngineMixin",
"client.sound.SoundManagerMixin"
Expand Down
Loading