Rooba
/
terminalizer
mirror of https://github.com/faressoft/terminalizer.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Render without GPU on specific electron error 

* Check the stderr for specific GPU related error
* Kill the failed process if it throws errors
* Reattach to events on retry properly
* Use faster `Date.now()`
This commit is contained in:
Nikola Maric 2020-05-03 16:06:19 +02:00 committed by Nikola Marić
parent f0b0b94cbf
commit ee30de6339
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
commands/render.js
View File

@ -115,29 +115,27 @@ function renderFrames(records, options) {
var framesCount = records.length;
// Track execution time
var start = (new Date()).getTime();
var start = Date.now();
// Create a progress bar
var progressBar = getProgressBar('Rendering', Math.ceil(framesCount / options.step));
// First try with GPU, on error try without GPU
// First try rendering with GPU, on error try without GPU
var attemptedRenderWithoutGPU = false;
// Execute the rendering process
var render = di.spawn(di.electron, [di.path.join(ROOT_PATH, 'render/index.js'), options.step], {detached: false});
render.stderr.on('data', function(error) {
if (!!error && !attemptedRenderWithoutGPU) {
console.log("Rendering failed, retrying with disabled GPU...");
render = di.spawn(di.electron, [di.path.join(ROOT_PATH, 'render/index.js'), options.step, '--disable-gpu'], {detached: false});
attemptedRenderWithoutGPU = true;
} else {
render.kill();
reject(new Error(error));
// Define rendering process spawning
var render = null;
function spawnRender(...args){
render = di.spawn(di.electron, [di.path.join(ROOT_PATH, 'render/index.js'), options.step, ...args], {detached: false});
render.stderr.on('data', onError);
render.stdout.on('data', onData);
}
});
render.stdout.on('data', function(data) {
// Execute the rendering process
spawnRender();
// Track progress of rendering through stdout
function onData(data) {
// Is not a recordIndex (to skip Electron's logs or new lines)
if (di.is.not.number(parseInt(data.toString()))) {
@ -145,15 +143,31 @@ function renderFrames(records, options) {
}
progressBar.tick();
// Rendering is completed
if (progressBar.complete) {
console.log("Finished rendering frames in " + ((new Date()).getTime() - start) + "ms.");
console.log('Finished rendering frames in ' + (Date.now() - start) + 'ms.');
resolve();
}
}
});
// React on rendering errors observed on its stderr
function onError(error) {
// First kill the rendering process
render.kill();
// Check for GPU error
if (!!error && error instanceof Buffer && error.toString('utf8').includes('GL_INVALID_OPERATION : glBufferData')) {
console.log('Rendering failed due to Electron error \'GL_INVALID_OPERATION: glBufferData\'!');
if (!attemptedRenderWithoutGPU) {
console.log('Retrying rendering with disabled GPU...');
attemptedRenderWithoutGPU = true;
return spawnRender('--disable-gpu');
}
}
// Finally reject renderFrames
reject(new Error(error));
}
});
}
@ -300,7 +314,7 @@ function command(argv) {
var framesCount = records.length;
// The path of the output file
var outputFile = di.utility.resolveFilePath('render' + (new Date()).getTime(), 'gif');
var outputFile = di.utility.resolveFilePath('render' + Date.now(), 'gif');
// For adjusting (calculating) the frames delays
var adjustFramesDelaysOptions = {