diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java index b28a14105..80d3b1a95 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java @@ -94,10 +94,6 @@ public class LodQuadTree extends QuadTree implements IDebugRen @Nullable public final BeaconRenderHandler beaconRenderHandler; - // TODO should be removed once James is done testing - @Deprecated - public static final PerfRecorder FILE_PERF_RECORDER = new PerfRecorder("File"); - /** the smallest numerical detail level number that can be rendered */ private byte maxLeafRenderDetailLevel; /** the largest numerical detail level number that can be rendered */ @@ -130,8 +126,6 @@ public class LodQuadTree extends QuadTree implements IDebugRen GenericObjectRenderer genericObjectRenderer = this.level.getGenericRenderer(); this.beaconRenderHandler = (genericObjectRenderer != null) ? new BeaconRenderHandler(genericObjectRenderer) : null; - FILE_PERF_RECORDER.clear(); - } @@ -155,8 +149,6 @@ public class LodQuadTree extends QuadTree implements IDebugRen } - FILE_PERF_RECORDER.tryLog(); - // this shouldn't be updated while the tree is being iterated through this.updateDetailLevelVariables(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java index 284c8ded7..527b7b9ec 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java @@ -128,9 +128,6 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable private boolean checkedIfFullDataSourceExists = false; private boolean fullDataSourceExists = false; - @Deprecated - public final PerfRecorder filePerfRecorder = LodQuadTree.FILE_PERF_RECORDER; - //=============// @@ -254,8 +251,6 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable LodQuadBuilder lodQuadBuilder = new LodQuadBuilder(enableTransparency, this.level.getClientLevelWrapper()); - PerfRecorder.Timer getAdj = this.filePerfRecorder.start("getAdj"); - // get the adjacent positions // needs to be done async to prevent threads waiting on the same positions to be processed final CompletableFuture[] adjacentLoadFutures = new CompletableFuture[4]; @@ -279,8 +274,6 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable return CompletableFuture.allOf(adjacentLoadFutures).thenRun(() -> { - getAdj.end(); - try (ColumnRenderSource northRenderSource = adjacentLoadFutures[0].get(); ColumnRenderSource southRenderSource = adjacentLoadFutures[1].get(); ColumnRenderSource eastRenderSource = adjacentLoadFutures[2].get(); @@ -300,13 +293,8 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable // the render sources are only needed by this synchronous method, // then they can be closed - PerfRecorder.Timer makeRender = this.filePerfRecorder.start("makeRender"); ColumnRenderBufferBuilder.makeLodRenderData(lodQuadBuilder, thisRenderSource, this.level, adjacentRenderSections, adjIsSameDetailLevel); - makeRender.end(); - - PerfRecorder.Timer upload = this.filePerfRecorder.start("upload"); this.uploadToGpuAsync(lodQuadBuilder); - upload.end(); } catch (Exception e) { @@ -350,8 +338,6 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable CompletableFuture loadFuture = new CompletableFuture<>(); executor.execute(() -> { - PerfRecorder.Timer getFull = this.filePerfRecorder.start("getFull"); - // generate new render source try (FullDataSourceV2 fullDataSource = // no direction means get the center LOD @@ -359,12 +345,8 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable ? this.fullDataSourceProvider.get(finalPos) : this.fullDataSourceProvider.getAdjForDirection(finalPos, direction.opposite())) { - getFull.end(); - - PerfRecorder.Timer transform = this.filePerfRecorder.start("transform"); ColumnRenderSource columnRenderSource = FullDataToRenderDataTransformer.transformFullDataToRenderSource(fullDataSource, this.levelWrapper); loadFuture.complete(columnRenderSource); - transform.end(); } catch (Exception e) {