Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: -renderbucket-size value not applied to GPU render (#256)

Browse Source 
* Fix: -renderbucket-size option not applied if configuration file doesn't exist
This commit is contained in:
Luis Uguina
2020-06-21 19:21:23 +10:00
committed by GitHub
parent f3538eafde
commit 36c14b6ee1
7 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/sheepit/client/SettingsLoader.java
View File

@@ -109,7 +109,7 @@ public class SettingsLoader {
gpu = gpu_.getId();
}
if (renderbucketSize_ >= 32) {
if (renderbucketSize_ >= GPU.MIN_RENDERBUCKET_SIZE) {
renderbucketSize = String.valueOf(renderbucketSize_);
}
}
@@ -382,7 +382,7 @@ public class SettingsLoader {
config.setGPUDevice(device);
// If the user has indicated a render bucket size at least 32x32 px, overwrite the config file value
if (config.getRenderbucketSize() >= 32) {
if (config.getRenderbucketSize() >= GPU.MIN_RENDERBUCKET_SIZE) {
config.getGPUDevice().setRenderbucketSize(config.getRenderbucketSize()); // Update size
}
else {
@@ -400,6 +400,19 @@ public class SettingsLoader {
config.setRenderbucketSize(config.getGPUDevice().getRenderbucketSize());
}
}
else if (config.getGPUDevice() != null) {
// The order of conditions is important to ensure the priority or app arguments, then the config file and finally the recommended size (if none
// specified or already in config file).
if (config.getRenderbucketSize() >= GPU.MIN_RENDERBUCKET_SIZE) {
config.getGPUDevice().setRenderbucketSize(config.getRenderbucketSize());
}
else if (renderbucketSize != null) {
config.getGPUDevice().setRenderbucketSize(Integer.parseInt(renderbucketSize));
}
else {
config.getGPUDevice().setRenderbucketSize(config.getGPUDevice().getRecommendedBucketSize());
}
}
if (config.getNbCores() == -1 && cores != null) {
config.setNbCores(Integer.valueOf(cores));