Merge pull request #367 from gpujs/359-addfunction-params-wrong

359 addfunction params wrong

Author: robertleeplummerjr

bin/gpu-core.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 1.8.0
- * @date Fri Sep 14 2018 11:50:25 GMT-0400 (EDT)
+ * @version 1.8.1
+ * @date Fri Sep 21 2018 06:53:44 GMT-0400 (EDT)
  *
  * @license MIT
  * The MIT License

bin/gpu-core.min.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 1.8.0
- * @date Fri Sep 14 2018 11:50:26 GMT-0400 (EDT)
+ * @version 1.8.1
+ * @date Fri Sep 21 2018 06:53:45 GMT-0400 (EDT)
  *
  * @license MIT
  * The MIT License
@@ -1669,7 +1669,7 @@ module.exports = function () {
 		value: function getUserParamName(paramName) {
 			var paramIndex = this.paramNames.indexOf(paramName);
 			if (paramIndex === -1) return null;
-			if (!this.parent) return null;
+			if (!this.parent || !this.isSubKernel) return null;
 			var calledFunctionArguments = this.parent.calledFunctionsArguments[this.functionName];
 			for (var i = 0; i < calledFunctionArguments.length; i++) {
 				var calledFunctionArgument = calledFunctionArguments[i];

bin/gpu.js

@@ -411,7 +411,7 @@ module.exports = function () {
 		value: function getUserParamName(paramName) {
 			var paramIndex = this.paramNames.indexOf(paramName);
 			if (paramIndex === -1) return null;
-			if (!this.parent) return null;
+			if (!this.parent || !this.isSubKernel) return null;
 			var calledFunctionArguments = this.parent.calledFunctionsArguments[this.functionName];
 			for (var i = 0; i < calledFunctionArguments.length; i++) {
 				var calledFunctionArgument = calledFunctionArguments[i];

bin/gpu.min.js

@@ -1,6 +1,6 @@
 {
   "name": "gpu.js",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "GPU Accelerated JavaScript",
   "main": "./dist/index.js",
   "directories": {

dist/backend/function-node-base.js

@@ -394,7 +394,7 @@ module.exports = class BaseFunctionNode {
 	getUserParamName(paramName) {
 		const paramIndex = this.paramNames.indexOf(paramName);
 		if (paramIndex === -1) return null;
-		if (!this.parent) return null;
+		if (!this.parent || !this.isSubKernel) return null;
 		const calledFunctionArguments = this.parent.calledFunctionsArguments[this.functionName];
 		for (let i = 0; i < calledFunctionArguments.length; i++) {
 			const calledFunctionArgument = calledFunctionArguments[i];

package.json

@@ -81,5 +81,6 @@
   <script src="issues/346-uint8array-converted.js"></script>
   <script src="issues/349-division-by-factors-of-3.js"></script>
   <script src="issues/357-modulus-issue.js"></script>
+  <script src="issues/359-addfunction-params-wrong.js"></script>
 </body>
 </html>

src/backend/function-node-base.js

@@ -0,0 +1,31 @@
+(function() {
+	function testAddFunctionKernel(mode) {
+		var gpu = new GPU({mode});
+
+		gpu.addFunction(function clcC(xx) {
+			return Math.abs(xx);
+		});
+
+		gpu.addFunction(function itermediate(c1) {
+			return clcC(c1);
+		});
+
+		const nestFunctionsKernel = gpu.createKernel(function() {
+			return itermediate(-1);
+		}, {
+			output: [1]
+		});
+
+		QUnit.assert.equal(nestFunctionsKernel()[0], 1);
+
+		gpu.destroy();
+	}
+
+	QUnit.test('Issue #359 - addFunction calls addFunction issue (webgl)', function() {
+		testAddFunctionKernel('webgl')
+	});
+
+	QUnit.test('Issue #359 - addFunction calls addFunction issue (webgl2)', function() {
+		testAddFunctionKernel('webgl2')
+	})
+})();