jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #582 from kanaka/bug/render-queue-corruption 

Make sure to copy arrays when using render queue
This commit is contained in:
Solly Ross 2016-02-24 16:52:55 -05:00
parent 670dbddb54 7bc383e8b6
commit b403cb92fb
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/display.js
View File

@ -471,9 +471,14 @@ var Display;
blitImage: function (x, y, width, height, arr, offset, from_queue) { blitImage: function (x, y, width, height, arr, offset, from_queue) {
if (this._renderQ.length !== 0 && !from_queue) { if (this._renderQ.length !== 0 && !from_queue) {
// NB(directxman12): it's technically more performant here to use preallocated arrays,
// but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
// this probably isn't getting called *nearly* as much
var new_arr = new Uint8Array(width * height * 4);
new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
this.renderQ_push({ this.renderQ_push({
'type': 'blit', 'type': 'blit',
'data': arr, 'data': new_arr,
'x': x, 'x': x,
'y': y, 'y': y,
'width': width, 'width': width,
@ -488,9 +493,14 @@ var Display;
blitRgbImage: function (x, y , width, height, arr, offset, from_queue) { blitRgbImage: function (x, y , width, height, arr, offset, from_queue) {
if (this._renderQ.length !== 0 && !from_queue) { if (this._renderQ.length !== 0 && !from_queue) {
// NB(directxman12): it's technically more performant here to use preallocated arrays,
// but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
// this probably isn't getting called *nearly* as much
var new_arr = new Uint8Array(width * height * 4);
new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
this.renderQ_push({ this.renderQ_push({
'type': 'blitRgb', 'type': 'blitRgb',
'data': arr, 'data': new_arr,
'x': x, 'x': x,
'y': y, 'y': y,
'width': width, 'width': width,
@ -506,7 +516,7 @@ var Display;
blitRgbxImage: function (x, y, width, height, arr, offset, from_queue) { blitRgbxImage: function (x, y, width, height, arr, offset, from_queue) {
if (this._renderQ.length !== 0 && !from_queue) { if (this._renderQ.length !== 0 && !from_queue) {
// NB(directxman12): it's technically more performant here to use preallocated arrays, but it // NB(directxman12): it's technically more performant here to use preallocated arrays,
// but it's a lot of extra work for not a lot of payoff -- if we're using the render queue, // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
// this probably isn't getting called *nearly* as much // this probably isn't getting called *nearly* as much
var new_arr = new Uint8Array(width * height * 4); var new_arr = new Uint8Array(width * height * 4);