Skip to content

sodium 2.5.2 compat #107

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
tildejustin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sodium 2.5.2 compat #107

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
37 changes: 32 additions & 5 deletions ...ain/java/me/contaria/seedqueue/mixin/compat/sodium/profiling/ChunkRenderManagerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ private void profilePop_init(CallbackInfo ci) {
method = "updateChunks",
at = @At("HEAD")
)
private void profileImportantRebuilds(CallbackInfo ci) {
SeedQueueProfiler.push("important_rebuilds");
private void profileLazyRebuilds(CallbackInfo ci) {
SeedQueueProfiler.push("lazy_rebuilds");
}

@Inject(
Expand All @@ -97,12 +97,39 @@ private void profileRebuilds(CallbackInfo ci) {
target = "Lme/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder;performPendingUploads()Z"
)
)
private void profilePendingUploads(CallbackInfo ci) {
private void profilePendingUploads_updateChunks(CallbackInfo ci) {
SeedQueueProfiler.swap("pending_uploads");
}

@Inject(
method = "updateChunks",
at = @At("RETURN")
)
private void profilePop_updateChunks(CallbackInfo ci) {
SeedQueueProfiler.pop();
}

@Inject(
method = "updateImportantChunks()V",
at = @At("HEAD")
)
private void profileImportantRebuilds(CallbackInfo ci) {
SeedQueueProfiler.push("important_rebuilds");
}

@Inject(
method = "updateImportantChunks()V",
at = @At(
value = "INVOKE",
target = "Lme/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder;performPendingUploads()Z"
)
)
private void profilePendingUploads_updateImportantChunks(CallbackInfo ci) {
SeedQueueProfiler.swap("pending_uploads");
}

@Inject(
method = "updateImportantChunks()V",
at = @At(
value = "INVOKE",
target = "Lme/jellysquid/mods/sodium/client/render/chunk/ChunkRenderBackend;upload(Lme/jellysquid/mods/sodium/client/gl/device/CommandList;Ljava/util/Iterator;)V"
Expand All @@ -113,10 +140,10 @@ private void profileBackendUpload(CallbackInfo ci) {
}

@Inject(
method = "updateChunks",
method = "updateImportantChunks()V",
at = @At("RETURN")
)
private void profilePop_updateChunks(CallbackInfo ci) {
private void profilePop_updateImportantChunks(CallbackInfo ci) {
SeedQueueProfiler.pop();
}

Expand Down