wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BufferUpload: Coresponding to core commit

Browse Source 
Changed configs. Also added some more exception logging in
ExperWorldGen. And added a flag to JVM Minecraft to force JVM to always
capture Stack Traces.
This commit is contained in:
tom lee
2021-12-27 16:09:20 +08:00
parent d1f805d178
commit 4ad4e2c29c
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/lod/common/Config.java
+1 -1
View File
@@ -224,7 +224,7 @@ public class Config extends ConfigGui
@Category("client.advanced.buffers")
@Entry(minValue = 0, maxValue = 5000)
public static int gpuUploadTimeoutInMilleseconds = IBuffers.GPU_UPLOAD_TIMEOUT_IN_MILLISECONDS_DEFAULT.defaultValue;
public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
@Category("client.advanced.buffers")
@Entry
common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java
+4 -4
View File
@@ -451,13 +451,13 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
@Override
public int getGpuUploadTimeoutInMilliseconds()
public int getGpuUploadPerMegabyteInMilliseconds()
{
return Config.Client.Advanced.Buffers.gpuUploadTimeoutInMilleseconds;
return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
}
@Override
public void setGpuUploadTimeoutInMilliseconds(int newTimeoutInMilliseconds) {
Config.Client.Advanced.Buffers.gpuUploadTimeoutInMilleseconds = newTimeoutInMilliseconds;
public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) {
Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds = newMilliseconds;
}
common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGenerationStep.java
+6 -7
View File
@@ -404,8 +404,12 @@ public final class WorldGenerationStep {
if (event.isCompleted()) {
try {
event.join();
} catch (RuntimeException e) {
// Ignore.
} catch (Throwable e) {
e.printStackTrace();
while (e.getCause() != null) {
e = e.getCause();
e.printStackTrace();
}
} finally {
iter.remove();
}
@@ -426,7 +430,6 @@ public final class WorldGenerationStep {
}
public final void generateLodFromList(GenerationEvent event) {
try {
// System.out.println("Started event: "+event);
event.pEvent.beginNano = System.nanoTime();
GridList<ChunkAccess> referencedChunks;
@@ -481,10 +484,6 @@ public final class WorldGenerationStep {
event.tParam.perf.recordEvent(event.pEvent);
ClientApi.LOGGER.info(event.tParam.perf);
}
} catch (RuntimeException e) {
e.printStackTrace();
throw e;
}
}
public final GridList<ChunkAccess> generateDirect(GenerationEvent e, int range, Steps step) {
common/src/main/resources/assets/lod/lang/en_us.json
+2 -2
View File
@@ -53,8 +53,8 @@
"DistantHorizons.config.client.advanced.buffers": "Buffers",
"DistantHorizons.config.client.advanced.buffers.gpuUploadMethod": "GPU upload method",
"DistantHorizons.config.client.advanced.buffers.gpuUploadMethod.@tooltip": "What method should be used to upload geometry to the GPU?",
"DistantHorizons.config.client.advanced.buffers.gpuUploadTimeoutInMilleseconds": "GPU upload timeout (milliseconds)",
"DistantHorizons.config.client.advanced.buffers.gpuUploadTimeoutInMilleseconds.@tooltip": "How long should we wait before uploading a buffer to the GPU? \nHelpful resource for frame times: https://fpstoms.com",
"DistantHorizons.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds": "GPU upload speed (milliseconds)",
"DistantHorizons.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds.@tooltip": "How long should a buffer wait per Megabyte of data uploaded? \nHelpful resource for frame times: https://fpstoms.com",
"DistantHorizons.config.client.advanced.buffers.rebuildTimes": "Rebuild times",
"DistantHorizons.config.client.advanced.buffers.rebuildTimes.@tooltip": "Rebuild times",
"DistantHorizons.config.client.advanced.debugging": "Debug",
core
+1 -1
Submodule core updated: 2f6ff1a3ea...5fe192f4c5
fabric/build.gradle
+1
View File
@@ -70,6 +70,7 @@ task copyCommonResources(type: Copy) {
runClient {
dependsOn(copyCoreResources)
dependsOn(copyCommonResources)
jvmArgs "-XX:-OmitStackTraceInFastThrow"
finalizedBy(deleteResources)
}