fix: If already an IGPUFunction don't convert to one

Author: robertleeplummerjr

dist/gpu-browser-core.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.6.0
- * @date Sat Jan 18 2020 08:34:13 GMT-0500 (Eastern Standard Time)
+ * @version 2.6.2
+ * @date Sun Jan 19 2020 07:44:58 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -6110,7 +6110,9 @@ class Kernel {
   }
 
   addFunction(source, settings = {}) {
-    if ('settings' in source && 'source' in source) {
+    if (source.name && source.source && source.argumentTypes && 'returnType' in source) {
+      this.functions.push(source);
+    } else if ('settings' in source && 'source' in source) {
       this.functions.push(this.functionToIGPUFunction(source.source, source.settings));
     } else if (typeof source === 'string' || typeof source === 'function') {
       this.functions.push(this.functionToIGPUFunction(source, settings));

dist/gpu-browser-core.min.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.6.0
- * @date Sat Jan 18 2020 08:34:13 GMT-0500 (Eastern Standard Time)
+ * @version 2.6.2
+ * @date Sun Jan 19 2020 07:44:57 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -10544,7 +10544,9 @@ class Kernel {
   }
 
   addFunction(source, settings = {}) {
-    if ('settings' in source && 'source' in source) {
+    if (source.name && source.source && source.argumentTypes && 'returnType' in source) {
+      this.functions.push(source);
+    } else if ('settings' in source && 'source' in source) {
       this.functions.push(this.functionToIGPUFunction(source.source, source.settings));
     } else if (typeof source === 'string' || typeof source === 'function') {
       this.functions.push(this.functionToIGPUFunction(source, settings));

dist/gpu-browser.js

@@ -1,6 +1,6 @@
 {
   "name": "gpu.js",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "GPU Accelerated JavaScript",
   "engines": {
     "node": ">=8.0.0"

dist/gpu-browser.min.js

@@ -320,12 +320,14 @@ class Kernel {
 
   /**
    *
-   * @param {KernelFunction|string} source
+   * @param {KernelFunction|string|IGPUFunction} source
    * @param {IFunctionSettings} [settings]
    * @return {Kernel}
    */
   addFunction(source, settings = {}) {
-    if ('settings' in source && 'source' in source) {
+    if (source.name && source.source && source.argumentTypes && 'returnType' in source) {
+      this.functions.push(source);
+    } else if ('settings' in source && 'source' in source) {
       this.functions.push(this.functionToIGPUFunction(source.source, source.settings));
     } else if (typeof source === 'string' || typeof source === 'function') {
       this.functions.push(this.functionToIGPUFunction(source, settings));

package-lock.json

@@ -13,7 +13,7 @@ export class GPU {
   nativeFunctions: IGPUNativeFunction[];
   setFunctions(flag: IFunction[]|KernelFunction[]): this;
   setNativeFunctions(flag: IGPUNativeFunction[]): this;
-  addFunction(kernel: KernelFunction, settings?: IGPUFunctionSettings): this;
+  addFunction(kernel: KernelFunction|IGPUFunction|string, settings?: IGPUFunctionSettings): this;
   addNativeFunction(name: string, source: string, settings?: IGPUFunctionSettings): this;
   combineKernels(...kernels: KernelFunction[]): IKernelRunShortcut;
   combineKernels<KF extends KernelFunction>(...kernels: KF[]):
@@ -213,8 +213,8 @@ export class Kernel {
   setImmutable(flag: boolean): this;
   setCanvas(flag: any): this;
   setContext(flag: any): this;
-  addFunction(flag: KernelFunction|string, settings?: IFunctionSettings): this;
-  setFunctions(flag: IFunction[]|KernelFunction[]): this;
+  addFunction(flag: KernelFunction|IGPUFunction|string, settings?: IFunctionSettings): this;
+  setFunctions(flag: IFunction[]|KernelFunction[]|IGPUFunction[]|string[]): this;
   setNativeFunctions(flag: IGPUNativeFunction[]): this;
   setStrictIntegers(flag: boolean): this;
   setTactic(flag: Tactic): this;

package.json

@@ -401,9 +401,11 @@ test('cpu', () => {
 
 describe('features: setFunctions from array on kernel');
 
-function testSetFunctionsFromArrayOnGPU(nativeFunction, mode) {
+function testSetFunctionsFromArrayOnGPU(mode) {
   const gpu = new GPU({ mode });
-  assert.equal(gpu.setNativeFunctions([nativeFunction]), gpu);
+  assert.equal(gpu.setFunctions([function custom() {
+    return 1;
+  }]), gpu);
   const kernel = gpu.createKernel(function() {
     return custom();
   }, { output: [1] });
@@ -412,56 +414,69 @@ function testSetFunctionsFromArrayOnGPU(nativeFunction, mode) {
 }
 
 test('auto', () => {
-  testSetFunctionsFromArrayOnGPU({
-    name: 'custom',
-    source: `float custom() {
-      return 1.0;
-    }`,
-  });
+  testSetFunctionsFromArrayOnGPU();
 });
 
 test('gpu', () => {
-  testSetFunctionsFromArrayOnGPU({
-    name: 'custom',
-    source: `float custom() {
-      return 1.0;
-    }`,
-  }, 'gpu');
+  testSetFunctionsFromArrayOnGPU('gpu');
 });
 
 (GPU.isWebGLSupported ? test : skip)('webgl', () => {
-  testSetFunctionsFromArrayOnGPU({
-    name: 'custom',
-    source: `float custom() {
-      return 1.0;
-    }`,
-  }, 'webgl');
+  testSetFunctionsFromArrayOnGPU('webgl');
 });
 
 (GPU.isWebGL2Supported ? test : skip)('webgl2', () => {
-  testSetFunctionsFromArrayOnGPU({
-    name: 'custom',
-    source: `float custom() {
-      return 1.0;
-    }`,
-  }, 'webgl2');
+  testSetFunctionsFromArrayOnGPU('webgl2');
 });
 
 (GPU.isHeadlessGLSupported ? test : skip)('headlessgl', () => {
-  testSetFunctionsFromArrayOnGPU({
-    name: 'custom',
-    source: `float custom() {
-      return 1.0;
-    }`,
-  }, 'headlessgl');
+  testSetFunctionsFromArrayOnGPU('headlessgl');
 });
 
 test('cpu', () => {
-  testSetFunctionsFromArrayOnGPU({
-    name: 'custom',
-    source: `function custom() {
-      return 1.0;
+  testSetFunctionsFromArrayOnGPU('cpu');
+});
+
+describe('features: setFunctions from array on kernel');
+
+function testAddIGPUFunction(mode) {
+  const gpu = new GPU({ mode });
+  const kernel = gpu.createKernel(function(value) {
+    return custom(value);
+  })
+    .setOutput([1])
+    .addFunction({
+      name: 'custom',
+      argumentTypes: { value: 'Number' },
+      source: `function custom(value) {
+      return value + 1.0;
     }`,
-    returnType: 'Number'
-  }, 'cpu');
+      returnType: 'Number',
+    });
+  assert.equal(kernel(1)[0], 2);
+  gpu.destroy();
+}
+
+test('auto', () => {
+  testAddIGPUFunction();
+});
+
+test('gpu', () => {
+  testAddIGPUFunction('gpu');
+});
+
+(GPU.isWebGLSupported ? test : skip)('webgl', () => {
+  testAddIGPUFunction('webgl');
+});
+
+(GPU.isWebGL2Supported ? test : skip)('webgl2', () => {
+  testAddIGPUFunction('webgl2');
+});
+
+(GPU.isHeadlessGLSupported ? test : skip)('headlessgl', () => {
+  testAddIGPUFunction('headlessgl');
+});
+
+test('cpu', () => {
+  testAddIGPUFunction('cpu');
 });