diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java index 04055f285..5215d6558 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java @@ -239,8 +239,10 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer return; } - GpuDevice GPU_DEVICE = RenderSystem.getDevice(); - CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); + // delayed getters since this class may be initialized before + // the GPU device has been set + GpuDevice gpuDevice = RenderSystem.getDevice(); + CommandEncoder commandEncoder = gpuDevice.createCommandEncoder(); @@ -287,14 +289,14 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer this.uniformBuffer = UniformHandler.createBuffer("uniformBlock", uniformBufferSize, this.uniformBuffer); GpuBufferSlice bufferSlice = new GpuBufferSlice(this.uniformBuffer, 0, uniformBufferSize); - COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer); + commandEncoder.writeToBuffer(bufferSlice, buffer); } // render // - try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass( + try (RenderPass renderPass = commandEncoder.createRenderPass( this::getRenderPassName, McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView, /*optionalClearColorAsInt*/ OptionalInt.empty(), diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/DebugRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/DebugRenderer.java index e7999132e..7cc016b57 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/DebugRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/DebugRenderer.java @@ -170,7 +170,6 @@ public class DebugRenderer extends AbstractDebugWireframeRenderer } @Override - @Deprecated // TODO this should add all the boxes to a list so we can render them as a batch instead of individual draw calls public void render(Box box) { Mat4f boxTransform = Mat4f.createTranslateMatrix(box.minPos.x - this.camPosFloatThisFrame.x, box.minPos.y - this.camPosFloatThisFrame.y, box.minPos.z - this.camPosFloatThisFrame.z); diff --git a/coreSubProjects b/coreSubProjects index 49e34d78a..2ea3d645e 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 49e34d78a521e3f795b06eb556025aa458dc2bb0 +Subproject commit 2ea3d645e81f955de253a5a290c53fc5987c1d8e