Merge branch 'master' into develop

gpujs · Jan 26, 2022 · 2ff65b1 · 2ff65b1
2 parents e9d3b66 + 49ee619
commit 2ff65b1
Show file tree

Hide file tree

Showing 17 changed files with 135 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -750,7 +750,9 @@ Types that can be used with GPU.js are as follows:
 * 'Array3D(3)' **New in V2!**
 * 'Array3D(4)' **New in V2!**
 * 'HTMLCanvas' **New in V2.6**
+* 'OffscreenCanvas' **New in V2.13**
 * 'HTMLImage'
+* 'ImageBitmap' **New in V2.14**
 * 'HTMLImageArray'
 * 'HTMLVideo' **New in V2!**
 * 'Number'

diff --git a/dist/gpu-browser-core.js b/dist/gpu-browser-core.js
@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.12.0
- * @date Wed Jan 26 2022 15:33:09 GMT-0500 (Eastern Standard Time)
+ * @version 2.14.0
+ * @date Wed Jan 26 2022 16:31:42 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -1614,7 +1614,9 @@ class CPUKernel extends Kernel {
       const type = this.constantTypes[p];
       switch (type) {
         case 'HTMLCanvas':
+        case 'OffscreenCanvas':
         case 'HTMLImage':
+        case 'ImageBitmap':
         case 'HTMLVideo':
           result.push(`    const constants_${p} = this._mediaTo2DArray(this.constants.${p});\n`);
           break;
@@ -1657,7 +1659,9 @@ class CPUKernel extends Kernel {
       const variableName = `user_${this.argumentNames[i]}`;
       switch (this.argumentTypes[i]) {
         case 'HTMLCanvas':
+        case 'OffscreenCanvas':
         case 'HTMLImage':
+        case 'ImageBitmap':
         case 'HTMLVideo':
           result.push(`    ${variableName} = this._mediaTo2DArray(${variableName});\n`);
           break;
@@ -3875,6 +3879,7 @@ const typeLookupMap = {
   'HTMLCanvas': 'Array(4)',
   'OffscreenCanvas': 'Array(4)',
   'HTMLImage': 'Array(4)',
+  'ImageBitmap': 'Array(4)',
   'HTMLVideo': 'Array(4)',
   'HTMLImageArray': 'Array(4)',
   'NumberTexture': 'Number',
@@ -8351,6 +8356,7 @@ class WebGLFunctionNode extends FunctionNode {
       case 'HTMLCanvas':
       case 'OffscreenCanvas':
       case 'HTMLImage':
+      case 'ImageBitmap':
       case 'HTMLVideo':
         retArr.push(`getVec4FromSampler2D(${ markupName }, ${ markupName }Size, ${ markupName }Dim, `);
         this.memberExpressionXYZ(xProperty, yProperty, zProperty, retArr);
@@ -8550,7 +8556,9 @@ class WebGLFunctionNode extends FunctionNode {
             }
             break;
           case 'HTMLCanvas':
+          case 'OffscreenCanvas':
           case 'HTMLImage':
+          case 'ImageBitmap':
           case 'HTMLImageArray':
           case 'HTMLVideo':
           case 'ArrayTexture(1)':
@@ -8662,7 +8670,9 @@ const typeMap = {
   'ArrayTexture(4)': 'sampler2D',
   'HTMLVideo': 'sampler2D',
   'HTMLCanvas': 'sampler2D',
+  'OffscreenCanvas': 'sampler2D',
   'HTMLImage': 'sampler2D',
+  'ImageBitmap': 'sampler2D',
   'HTMLImageArray': 'sampler2DArray',
 };
 
@@ -8674,6 +8684,7 @@ const operatorMap = {
 module.exports = {
   WebGLFunctionNode
 };
+
 },{"../../utils":113,"../function-node":9}],38:[function(require,module,exports){
 const { WebGLKernelValueBoolean } = require('./kernel-value/boolean');
 const { WebGLKernelValueFloat } = require('./kernel-value/float');
@@ -8745,6 +8756,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGLKernelValueDynamicHTMLImage,
       'HTMLImage': WebGLKernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGLKernelValueDynamicHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueDynamicHTMLVideo,
     },
@@ -8775,6 +8787,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueHTMLImage,
       'OffscreenCanvas': WebGLKernelValueHTMLImage,
       'HTMLImage': WebGLKernelValueHTMLImage,
+      'ImageBitmap': WebGLKernelValueHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueHTMLVideo,
     }
@@ -8807,6 +8820,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGLKernelValueDynamicHTMLImage,
       'HTMLImage': WebGLKernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGLKernelValueDynamicHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueDynamicHTMLVideo,
     },
@@ -8837,6 +8851,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueHTMLImage,
       'OffscreenCanvas': WebGLKernelValueHTMLImage,
       'HTMLImage': WebGLKernelValueHTMLImage,
+      'ImageBitmap': WebGLKernelValueHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueHTMLVideo,
     }
@@ -12030,6 +12045,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImage': WebGL2KernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImageArray': WebGL2KernelValueDynamicHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueDynamicHTMLVideo,
     },
@@ -12060,6 +12076,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueHTMLImage,
       'HTMLImage': WebGL2KernelValueHTMLImage,
+      'ImageBitmap': WebGL2KernelValueHTMLImage,
       'HTMLImageArray': WebGL2KernelValueHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueHTMLVideo,
     }
@@ -12092,6 +12109,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImage': WebGL2KernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImageArray': WebGL2KernelValueDynamicHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueDynamicHTMLVideo,
     },
@@ -12122,6 +12140,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueHTMLImage,
       'HTMLImage': WebGL2KernelValueHTMLImage,
+      'ImageBitmap': WebGL2KernelValueHTMLImage,
       'HTMLImageArray': WebGL2KernelValueHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueHTMLVideo,
     }
@@ -14241,6 +14260,8 @@ const utils = {
         return 'Input';
       case OffscreenCanvas:
         return 'OffscreenCanvas';
+      case ImageBitmap:
+        return 'ImageBitmap';
     }
     switch (value.nodeName) {
       case 'IMG':

diff --git a/dist/gpu-browser-core.min.js b/dist/gpu-browser-core.min.js
diff --git a/dist/gpu-browser.js b/dist/gpu-browser.js
@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.12.0
- * @date Wed Jan 26 2022 15:33:09 GMT-0500 (Eastern Standard Time)
+ * @version 2.14.0
+ * @date Wed Jan 26 2022 16:31:43 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -6067,7 +6067,9 @@ class CPUKernel extends Kernel {
       const type = this.constantTypes[p];
       switch (type) {
         case 'HTMLCanvas':
+        case 'OffscreenCanvas':
         case 'HTMLImage':
+        case 'ImageBitmap':
         case 'HTMLVideo':
           result.push(`    const constants_${p} = this._mediaTo2DArray(this.constants.${p});\n`);
           break;
@@ -6110,7 +6112,9 @@ class CPUKernel extends Kernel {
       const variableName = `user_${this.argumentNames[i]}`;
       switch (this.argumentTypes[i]) {
         case 'HTMLCanvas':
+        case 'OffscreenCanvas':
         case 'HTMLImage':
+        case 'ImageBitmap':
         case 'HTMLVideo':
           result.push(`    ${variableName} = this._mediaTo2DArray(${variableName});\n`);
           break;
@@ -8328,6 +8332,7 @@ const typeLookupMap = {
   'HTMLCanvas': 'Array(4)',
   'OffscreenCanvas': 'Array(4)',
   'HTMLImage': 'Array(4)',
+  'ImageBitmap': 'Array(4)',
   'HTMLVideo': 'Array(4)',
   'HTMLImageArray': 'Array(4)',
   'NumberTexture': 'Number',
@@ -12804,6 +12809,7 @@ class WebGLFunctionNode extends FunctionNode {
       case 'HTMLCanvas':
       case 'OffscreenCanvas':
       case 'HTMLImage':
+      case 'ImageBitmap':
       case 'HTMLVideo':
         retArr.push(`getVec4FromSampler2D(${ markupName }, ${ markupName }Size, ${ markupName }Dim, `);
         this.memberExpressionXYZ(xProperty, yProperty, zProperty, retArr);
@@ -13003,7 +13009,9 @@ class WebGLFunctionNode extends FunctionNode {
             }
             break;
           case 'HTMLCanvas':
+          case 'OffscreenCanvas':
           case 'HTMLImage':
+          case 'ImageBitmap':
           case 'HTMLImageArray':
           case 'HTMLVideo':
           case 'ArrayTexture(1)':
@@ -13115,7 +13123,9 @@ const typeMap = {
   'ArrayTexture(4)': 'sampler2D',
   'HTMLVideo': 'sampler2D',
   'HTMLCanvas': 'sampler2D',
+  'OffscreenCanvas': 'sampler2D',
   'HTMLImage': 'sampler2D',
+  'ImageBitmap': 'sampler2D',
   'HTMLImageArray': 'sampler2DArray',
 };
 
@@ -13127,6 +13137,7 @@ const operatorMap = {
 module.exports = {
   WebGLFunctionNode
 };
+
 },{"../../utils":114,"../function-node":10}],39:[function(require,module,exports){
 const { WebGLKernelValueBoolean } = require('./kernel-value/boolean');
 const { WebGLKernelValueFloat } = require('./kernel-value/float');
@@ -13198,6 +13209,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGLKernelValueDynamicHTMLImage,
       'HTMLImage': WebGLKernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGLKernelValueDynamicHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueDynamicHTMLVideo,
     },
@@ -13228,6 +13240,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueHTMLImage,
       'OffscreenCanvas': WebGLKernelValueHTMLImage,
       'HTMLImage': WebGLKernelValueHTMLImage,
+      'ImageBitmap': WebGLKernelValueHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueHTMLVideo,
     }
@@ -13260,6 +13273,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGLKernelValueDynamicHTMLImage,
       'HTMLImage': WebGLKernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGLKernelValueDynamicHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueDynamicHTMLVideo,
     },
@@ -13290,6 +13304,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGLKernelValueHTMLImage,
       'OffscreenCanvas': WebGLKernelValueHTMLImage,
       'HTMLImage': WebGLKernelValueHTMLImage,
+      'ImageBitmap': WebGLKernelValueHTMLImage,
       'HTMLImageArray': false,
       'HTMLVideo': WebGLKernelValueHTMLVideo,
     }
@@ -16483,6 +16498,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImage': WebGL2KernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImageArray': WebGL2KernelValueDynamicHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueDynamicHTMLVideo,
     },
@@ -16513,6 +16529,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueHTMLImage,
       'HTMLImage': WebGL2KernelValueHTMLImage,
+      'ImageBitmap': WebGL2KernelValueHTMLImage,
       'HTMLImageArray': WebGL2KernelValueHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueHTMLVideo,
     }
@@ -16545,6 +16562,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueDynamicHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImage': WebGL2KernelValueDynamicHTMLImage,
+      'ImageBitmap': WebGL2KernelValueDynamicHTMLImage,
       'HTMLImageArray': WebGL2KernelValueDynamicHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueDynamicHTMLVideo,
     },
@@ -16575,6 +16593,7 @@ const kernelValueMaps = {
       'HTMLCanvas': WebGL2KernelValueHTMLImage,
       'OffscreenCanvas': WebGL2KernelValueHTMLImage,
       'HTMLImage': WebGL2KernelValueHTMLImage,
+      'ImageBitmap': WebGL2KernelValueHTMLImage,
       'HTMLImageArray': WebGL2KernelValueHTMLImageArray,
       'HTMLVideo': WebGL2KernelValueHTMLVideo,
     }
@@ -18694,6 +18713,8 @@ const utils = {
         return 'Input';
       case OffscreenCanvas:
         return 'OffscreenCanvas';
+      case ImageBitmap:
+        return 'ImageBitmap';
     }
     switch (value.nodeName) {
       case 'IMG':

diff --git a/dist/gpu-browser.min.js b/dist/gpu-browser.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gpu.js",
-  "version": "2.12.0",
+  "version": "2.14.0",
   "description": "GPU Accelerated JavaScript",
   "engines": {
     "node": ">=8.0.0"

diff --git a/src/backend/cpu/kernel.js b/src/backend/cpu/kernel.js
@@ -266,7 +266,9 @@ class CPUKernel extends Kernel {
       const type = this.constantTypes[p];
       switch (type) {
         case 'HTMLCanvas':
+        case 'OffscreenCanvas':
         case 'HTMLImage':
+        case 'ImageBitmap':
         case 'HTMLVideo':
           result.push(`    const constants_${p} = this._mediaTo2DArray(this.constants.${p});\n`);
           break;
@@ -309,7 +311,9 @@ class CPUKernel extends Kernel {
       const variableName = `user_${this.argumentNames[i]}`;
       switch (this.argumentTypes[i]) {
         case 'HTMLCanvas':
+        case 'OffscreenCanvas':
         case 'HTMLImage':
+        case 'ImageBitmap':
         case 'HTMLVideo':
           result.push(`    ${variableName} = this._mediaTo2DArray(${variableName});\n`);
           break;

diff --git a/src/backend/function-node.js b/src/backend/function-node.js
@@ -1472,6 +1472,7 @@ const typeLookupMap = {
   'HTMLCanvas': 'Array(4)',
   'OffscreenCanvas': 'Array(4)',
   'HTMLImage': 'Array(4)',
+  'ImageBitmap': 'Array(4)',
   'HTMLVideo': 'Array(4)',
   'HTMLImageArray': 'Array(4)',
   'NumberTexture': 'Number',

diff --git a/src/backend/web-gl/function-node.js b/src/backend/web-gl/function-node.js
@@ -1250,6 +1250,7 @@ class WebGLFunctionNode extends FunctionNode {
       case 'HTMLCanvas':
       case 'OffscreenCanvas':
       case 'HTMLImage':
+      case 'ImageBitmap':
       case 'HTMLVideo':
         retArr.push(`getVec4FromSampler2D(${ markupName }, ${ markupName }Size, ${ markupName }Dim, `);
         this.memberExpressionXYZ(xProperty, yProperty, zProperty, retArr);
@@ -1465,7 +1466,9 @@ class WebGLFunctionNode extends FunctionNode {
             }
             break;
           case 'HTMLCanvas':
+          case 'OffscreenCanvas':
           case 'HTMLImage':
+          case 'ImageBitmap':
           case 'HTMLImageArray':
           case 'HTMLVideo':
           case 'ArrayTexture(1)':
@@ -1584,7 +1587,9 @@ const typeMap = {
   'ArrayTexture(4)': 'sampler2D',
   'HTMLVideo': 'sampler2D',
   'HTMLCanvas': 'sampler2D',
+  'OffscreenCanvas': 'sampler2D',
   'HTMLImage': 'sampler2D',
+  'ImageBitmap': 'sampler2D',
   'HTMLImageArray': 'sampler2DArray',
 };