Skip to content

Commit 5e13509

Browse files
robertleeplummerjrrobertleeplummerjr
committed
Merge branch 'develop'
2 parents 1fb3b74 + 8b49fbb commit 5e13509

File tree

9 files changed

+38
-26
lines changed

9 files changed

+38
-26
lines changed

‎bin/gpu-core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* GPU Accelerated JavaScript
66
*
7-
* @version 1.6.0
8-
* @date Sun Aug 05 2018 15:35:02 GMT-0400 (EDT)
7+
* @version 1.6.1
8+
* @date Sun Sep 02 2018 12:23:56 GMT-0400 (EDT)
99
*
1010
* @license MIT
1111
* The MIT License

‎bin/gpu-core.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/gpu.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* GPU Accelerated JavaScript
66
*
7-
* @version 1.6.0
8-
* @date Sun Aug 05 2018 15:35:03 GMT-0400 (EDT)
7+
* @version 1.6.1
8+
* @date Sun Sep 02 2018 12:23:57 GMT-0400 (EDT)
99
*
1010
* @license MIT
1111
* The MIT License
@@ -3591,8 +3591,10 @@ module.exports = function (_KernelBase) {
35913591
} else {
35923592
var result = void 0;
35933593
if (this.floatOutput) {
3594-
result = new Float32Array(texSize[0] * texSize[1] * 4);
3595-
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.FLOAT, result);
3594+
var w = texSize[0];
3595+
var h = Math.ceil(texSize[1] / 4);
3596+
result = new Float32Array(w * h * 4);
3597+
gl.readPixels(0, 0, w, h, gl.RGBA, gl.FLOAT, result);
35963598
} else {
35973599
var bytes = new Uint8Array(texSize[0] * texSize[1] * 4);
35983600
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.UNSIGNED_BYTE, bytes);
@@ -5546,8 +5548,10 @@ var GPU = function (_GPUCore) {
55465548
var threadDim = lastKernel.threadDim;
55475549
var result = void 0;
55485550
if (lastKernel.floatOutput) {
5549-
result = new Float32Array(texSize[0] * texSize[1] * 4);
5550-
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.FLOAT, result);
5551+
var w = texSize[0];
5552+
var h = Math.ceil(texSize[1] / 4);
5553+
result = new Float32Array(w * h * 4);
5554+
gl.readPixels(0, 0, w, h, gl.RGBA, gl.FLOAT, result);
55515555
} else {
55525556
var bytes = new Uint8Array(texSize[0] * texSize[1] * 4);
55535557
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.UNSIGNED_BYTE, bytes);

‎bin/gpu.min.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/backend/web-gl/kernel.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,10 @@ module.exports = function (_KernelBase) {
410410
} else {
411411
var result = void 0;
412412
if (this.floatOutput) {
413-
result = new Float32Array(texSize[0] * texSize[1] * 4);
414-
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.FLOAT, result);
413+
var w = texSize[0];
414+
var h = Math.ceil(texSize[1] / 4);
415+
result = new Float32Array(w * h * 4);
416+
gl.readPixels(0, 0, w, h, gl.RGBA, gl.FLOAT, result);
415417
} else {
416418
var bytes = new Uint8Array(texSize[0] * texSize[1] * 4);
417419
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.UNSIGNED_BYTE, bytes);

‎dist/core/gpu.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@ var GPU = function (_GPUCore) {
256256
var threadDim = lastKernel.threadDim;
257257
var result = void 0;
258258
if (lastKernel.floatOutput) {
259-
result = new Float32Array(texSize[0] * texSize[1] * 4);
260-
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.FLOAT, result);
259+
var w = texSize[0];
260+
var h = Math.ceil(texSize[1] / 4);
261+
result = new Float32Array(w * h * 4);
262+
gl.readPixels(0, 0, w, h, gl.RGBA, gl.FLOAT, result);
261263
} else {
262264
var bytes = new Uint8Array(texSize[0] * texSize[1] * 4);
263265
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.UNSIGNED_BYTE, bytes);

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gpu.js",
3-
"version": "1.6.0",
3+
"version": "1.6.1",
44
"description": "GPU Accelerated JavaScript",
55
"main": "./dist/index.js",
66
"directories": {

‎src/backend/web-gl/kernel.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,10 @@ module.exports = class WebGLKernel extends KernelBase {
386386
} else {
387387
let result;
388388
if (this.floatOutput) {
389-
result = new Float32Array(texSize[0] * texSize[1] * 4);
390-
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.FLOAT, result);
389+
const w = texSize[0];
390+
const h = Math.ceil(texSize[1] / 4);
391+
result = new Float32Array(w * h * 4);
392+
gl.readPixels(0, 0, w, h, gl.RGBA, gl.FLOAT, result);
391393
} else {
392394
const bytes = new Uint8Array(texSize[0] * texSize[1] * 4);
393395
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.UNSIGNED_BYTE, bytes);

‎src/core/gpu.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,10 @@ class GPU extends GPUCore {
235235
const threadDim = lastKernel.threadDim;
236236
let result;
237237
if (lastKernel.floatOutput) {
238-
result = new Float32Array(texSize[0] * texSize[1] * 4);
239-
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.FLOAT, result);
238+
const w = texSize[0];
239+
const h = Math.ceil(texSize[1] / 4);
240+
result = new Float32Array(w * h * 4);
241+
gl.readPixels(0, 0, w, h, gl.RGBA, gl.FLOAT, result);
240242
} else {
241243
const bytes = new Uint8Array(texSize[0] * texSize[1] * 4);
242244
gl.readPixels(0, 0, texSize[0], texSize[1], gl.RGBA, gl.UNSIGNED_BYTE, bytes);

0 commit comments

Comments
 (0)