From c2e95876d0d7c98705052391063af7bd119c5b43 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Mon, 21 Apr 2025 01:56:41 +1000 Subject: [PATCH] Change upload stream full from warning to error --- .../cortex/voxy/client/core/rendering/util/UploadStream.java | 4 ++-- .../java/me/cortex/voxy/common/util/HierarchicalBitSet.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java index f1efaa9d..21f84aae 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java @@ -50,7 +50,7 @@ public class UploadStream { //Note! we dont commit here, we only try to flush existing memory copies, we dont commit // since commit is an explicit op saying we are done any to push upload everything //We dont commit since we dont want to invalidate existing upload pointers - Logger.warn("Upload stream full, preemptively committing, this could cause bad things to happen"); + Logger.error("Upload stream full, preemptively committing, this could cause bad things to happen"); int attempts = 10; while (--attempts != 0 && this.caddr == SIZE_LIMIT) { glFinish(); @@ -124,6 +124,6 @@ public class UploadStream { //A upload instance instead of passing one around by reference // MUST ONLY BE USED ON THE RENDER THREAD - public static final UploadStream INSTANCE = new UploadStream(1<<25);//32 mb upload buffer + public static final UploadStream INSTANCE = new UploadStream(1<<26);//64 mb upload buffer } diff --git a/src/main/java/me/cortex/voxy/common/util/HierarchicalBitSet.java b/src/main/java/me/cortex/voxy/common/util/HierarchicalBitSet.java index 9757b842..6c380935 100644 --- a/src/main/java/me/cortex/voxy/common/util/HierarchicalBitSet.java +++ b/src/main/java/me/cortex/voxy/common/util/HierarchicalBitSet.java @@ -69,6 +69,10 @@ public class HierarchicalBitSet { } private void set(int idx) { + //if (this.isSet(idx)) { + // throw new IllegalStateException(); + //} + this.endId += idx==(this.endId+1)?1:0; long dp = this.D[idx>>6] |= 1L<<(idx&0x3f); if (dp==-1) {