Merge pull request #384 from gpujs/382-bad-constant

robertleeplummerjr · web-flow · commit f3fb9fc41627 · 2018-10-24T15:07:07.000-04:00
fix #382: Constant being set weirdly and conflicting with user variables
diff --git a/bin/gpu-core.js b/bin/gpu-core.js
@@ -5,7 +5,7 @@
  * GPU Accelerated JavaScript
  *
  * @version 1.9.0
- * @date Wed Oct 24 2018 14:09:46 GMT-0400 (EDT)
+ * @date Wed Oct 24 2018 14:56:50 GMT-0400 (EDT)
  *
  * @license MIT
  * The MIT License
diff --git a/bin/gpu-core.min.js b/bin/gpu-core.min.js
diff --git a/bin/gpu.js b/bin/gpu.js
@@ -5,7 +5,7 @@
  * GPU Accelerated JavaScript
  *
  * @version 1.9.0
- * @date Wed Oct 24 2018 14:09:46 GMT-0400 (EDT)
+ * @date Wed Oct 24 2018 14:56:51 GMT-0400 (EDT)
  *
  * @license MIT
  * The MIT License
@@ -2683,15 +2683,11 @@ module.exports = function (_FunctionNodeBase) {
 					retArr.push('3.402823466e+38');
 					break;
 				default:
-					if (this.constants && this.constants.hasOwnProperty(idtNode.name)) {
-						this.pushParameter(retArr, 'constants_' + idtNode.name);
+					var userParamName = this.getUserParamName(idtNode.name);
+					if (userParamName !== null) {
+						this.pushParameter(retArr, 'user_' + userParamName);
 					} else {
-						var userParamName = this.getUserParamName(idtNode.name);
-						if (userParamName !== null) {
-							this.pushParameter(retArr, 'user_' + userParamName);
-						} else {
-							this.pushParameter(retArr, 'user_' + idtNode.name);
-						}
+						this.pushParameter(retArr, 'user_' + idtNode.name);
 					}
 			}
 
@@ -3642,7 +3638,7 @@ module.exports = function (_KernelBase) {
 			for (var p in this.constants) {
 				var value = this.constants[p];
 				var type = utils.getArgumentType(value);
-				if (type === 'Decimal' || type === 'Integer') {
+				if (type === 'Float' || type === 'Integer') {
 					continue;
 				}
 				gl.useProgram(this.program);
@@ -4160,12 +4156,6 @@ module.exports = function (_KernelBase) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
-				case 'Integer':
-				case 'Float':
-					{
-						this.setUniform1f('constants_' + name, value);
-						break;
-					}
 				case 'Input':
 					{
 						var input = value;
@@ -4240,6 +4230,8 @@ module.exports = function (_KernelBase) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
+				case 'Integer':
+				case 'Float':
 				default:
 					throw new Error('Input type not supported (WebGL): ' + value);
 			}
@@ -4919,15 +4911,11 @@ module.exports = function (_WebGLFunctionNode) {
 					retArr.push('intBitsToFloat(2139095039)');
 					break;
 				default:
-					if (this.constants && this.constants.hasOwnProperty(idtNode.name)) {
-						this.pushParameter(retArr, 'constants_' + idtNode.name);
+					var userParamName = this.getUserParamName(idtNode.name);
+					if (userParamName !== null) {
+						this.pushParameter(retArr, 'user_' + userParamName);
 					} else {
-						var userParamName = this.getUserParamName(idtNode.name);
-						if (userParamName !== null) {
-							this.pushParameter(retArr, 'user_' + userParamName);
-						} else {
-							this.pushParameter(retArr, 'user_' + idtNode.name);
-						}
+						this.pushParameter(retArr, 'user_' + idtNode.name);
 					}
 			}
 
@@ -5417,12 +5405,6 @@ module.exports = function (_WebGLKernel) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
-				case 'Integer':
-				case 'Float':
-					{
-						this.setUniform1f('constants_' + name, value);
-						break;
-					}
 				case 'Input':
 					{
 						var input = value;
@@ -5528,6 +5510,8 @@ module.exports = function (_WebGLKernel) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
+				case 'Integer':
+				case 'Float':
 				default:
 					throw new Error('Input type not supported (WebGL): ' + value);
 			}
diff --git a/bin/gpu.min.js b/bin/gpu.min.js
diff --git a/dist/backend/web-gl/function-node.js b/dist/backend/web-gl/function-node.js
@@ -356,15 +356,11 @@ module.exports = function (_FunctionNodeBase) {
 					retArr.push('3.402823466e+38');
 					break;
 				default:
-					if (this.constants && this.constants.hasOwnProperty(idtNode.name)) {
-						this.pushParameter(retArr, 'constants_' + idtNode.name);
+					var userParamName = this.getUserParamName(idtNode.name);
+					if (userParamName !== null) {
+						this.pushParameter(retArr, 'user_' + userParamName);
 					} else {
-						var userParamName = this.getUserParamName(idtNode.name);
-						if (userParamName !== null) {
-							this.pushParameter(retArr, 'user_' + userParamName);
-						} else {
-							this.pushParameter(retArr, 'user_' + idtNode.name);
-						}
+						this.pushParameter(retArr, 'user_' + idtNode.name);
 					}
 			}
 
diff --git a/dist/backend/web-gl/kernel.js b/dist/backend/web-gl/kernel.js
@@ -287,7 +287,7 @@ module.exports = function (_KernelBase) {
 			for (var p in this.constants) {
 				var value = this.constants[p];
 				var type = utils.getArgumentType(value);
-				if (type === 'Decimal' || type === 'Integer') {
+				if (type === 'Float' || type === 'Integer') {
 					continue;
 				}
 				gl.useProgram(this.program);
@@ -942,12 +942,6 @@ module.exports = function (_KernelBase) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
-				case 'Integer':
-				case 'Float':
-					{
-						this.setUniform1f('constants_' + name, value);
-						break;
-					}
 				case 'Input':
 					{
 						var input = value;
@@ -1023,6 +1017,8 @@ module.exports = function (_KernelBase) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
+				case 'Integer':
+				case 'Float':
 				default:
 					throw new Error('Input type not supported (WebGL): ' + value);
 			}
diff --git a/dist/backend/web-gl2/function-node.js b/dist/backend/web-gl2/function-node.js
@@ -172,15 +172,11 @@ module.exports = function (_WebGLFunctionNode) {
 					retArr.push('intBitsToFloat(2139095039)');
 					break;
 				default:
-					if (this.constants && this.constants.hasOwnProperty(idtNode.name)) {
-						this.pushParameter(retArr, 'constants_' + idtNode.name);
+					var userParamName = this.getUserParamName(idtNode.name);
+					if (userParamName !== null) {
+						this.pushParameter(retArr, 'user_' + userParamName);
 					} else {
-						var userParamName = this.getUserParamName(idtNode.name);
-						if (userParamName !== null) {
-							this.pushParameter(retArr, 'user_' + userParamName);
-						} else {
-							this.pushParameter(retArr, 'user_' + idtNode.name);
-						}
+						this.pushParameter(retArr, 'user_' + idtNode.name);
 					}
 			}
 
diff --git a/dist/backend/web-gl2/kernel.js b/dist/backend/web-gl2/kernel.js
@@ -555,12 +555,6 @@ module.exports = function (_WebGLKernel) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
-				case 'Integer':
-				case 'Float':
-					{
-						this.setUniform1f('constants_' + name, value);
-						break;
-					}
 				case 'Input':
 					{
 						var input = value;
@@ -668,6 +662,8 @@ module.exports = function (_WebGLKernel) {
 						this.setUniform1i('constants_' + name, this.constantsLength);
 						break;
 					}
+				case 'Integer':
+				case 'Float':
 				default:
 					throw new Error('Input type not supported (WebGL): ' + value);
 			}
diff --git a/src/backend/web-gl/function-node.js b/src/backend/web-gl/function-node.js
@@ -354,15 +354,11 @@ module.exports = class WebGLFunctionNode extends FunctionNodeBase {
 				retArr.push('3.402823466e+38');
 				break;
 			default:
-				if (this.constants && this.constants.hasOwnProperty(idtNode.name)) {
-					this.pushParameter(retArr, 'constants_' + idtNode.name);
+				const userParamName = this.getUserParamName(idtNode.name);
+				if (userParamName !== null) {
+					this.pushParameter(retArr, 'user_' + userParamName);
 				} else {
-					const userParamName = this.getUserParamName(idtNode.name);
-					if (userParamName !== null) {
-						this.pushParameter(retArr, 'user_' + userParamName);
-					} else {
-						this.pushParameter(retArr, 'user_' + idtNode.name);
-					}
+					this.pushParameter(retArr, 'user_' + idtNode.name);
 				}
 		}
 
diff --git a/src/backend/web-gl/kernel.js b/src/backend/web-gl/kernel.js
@@ -264,7 +264,7 @@ module.exports = class WebGLKernel extends KernelBase {
 		for (let p in this.constants) {
 			const value = this.constants[p]
 			const type = utils.getArgumentType(value);
-			if (type === 'Decimal' || type === 'Integer') {
+			if (type === 'Float' || type === 'Integer') {
 				continue;
 			}
 			gl.useProgram(this.program);
@@ -904,12 +904,6 @@ module.exports = class WebGLKernel extends KernelBase {
 					this.setUniform1i(`constants_${name}`, this.constantsLength);
 					break;
 				}
-			case 'Integer':
-			case 'Float':
-				{
-					this.setUniform1f(`constants_${name}`, value);
-					break;
-				}
 			case 'Input':
 				{
 					const input = value;
@@ -990,6 +984,8 @@ module.exports = class WebGLKernel extends KernelBase {
 					this.setUniform1i(`constants_${name}`, this.constantsLength);
 					break;
 				}
+			case 'Integer':
+			case 'Float':
 			default:
 				throw new Error('Input type not supported (WebGL): ' + value);
 		}
diff --git a/src/backend/web-gl2/function-node.js b/src/backend/web-gl2/function-node.js
@@ -154,15 +154,11 @@ module.exports = class WebGL2FunctionNode extends WebGLFunctionNode {
 				retArr.push('intBitsToFloat(2139095039)');
 				break;
 			default:
-				if (this.constants && this.constants.hasOwnProperty(idtNode.name)) {
-					this.pushParameter(retArr, 'constants_' + idtNode.name);
+				const userParamName = this.getUserParamName(idtNode.name);
+				if (userParamName !== null) {
+					this.pushParameter(retArr, 'user_' + userParamName);
 				} else {
-					const userParamName = this.getUserParamName(idtNode.name);
-					if (userParamName !== null) {
-						this.pushParameter(retArr, 'user_' + userParamName);
-					} else {
-						this.pushParameter(retArr, 'user_' + idtNode.name);
-					}
+					this.pushParameter(retArr, 'user_' + idtNode.name);
 				}
 		}
 
diff --git a/src/backend/web-gl2/kernel.js b/src/backend/web-gl2/kernel.js
@@ -562,12 +562,6 @@ module.exports = class WebGL2Kernel extends WebGLKernel {
 					this.setUniform1i(`constants_${name}`, this.constantsLength);
 					break;
 				}
-			case 'Integer':
-			case 'Float':
-				{
-					this.setUniform1f(`constants_${name}`, value);
-					break;
-				}
 			case 'Input':
 				{
 					const input = value;
@@ -703,6 +697,8 @@ module.exports = class WebGL2Kernel extends WebGLKernel {
 					this.setUniform1i(`constants_${name}`, this.constantsLength);
 					break;
 				}
+			case 'Integer':
+			case 'Float':
 			default:
 				throw new Error('Input type not supported (WebGL): ' + value);
 		}
diff --git a/test/all.html b/test/all.html
@@ -85,5 +85,6 @@
   <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>
+  <script src="issues/382-bad-constant.js"></script>
 </body>
 </html>
diff --git a/test/issues/382-bad-constant.js b/test/issues/382-bad-constant.js
@@ -0,0 +1,26 @@
+(function() {
+	function testModKernel(mode) {
+		var gpu = new GPU({ mode: mode });
+    var conflictingName = 0.4;
+		var kernel = gpu.createKernel(function(a, conflictingName) {
+      return a[this.thread.x] + this.constants.conflictingName + conflictingName;
+    })
+			.setOutput([1])
+			.setConstants({
+        conflictingName: conflictingName
+			});
+
+		var result = kernel([1], 0.6);
+
+		QUnit.assert.equal(result[0], 2);
+		gpu.destroy();
+	}
+
+	QUnit.test('Issue #382 - bad constant (webgl)', function() {
+		testModKernel('webgl')
+	});
+
+	QUnit.test('Issue #382 - bad constant (webgl2)', function() {
+		testModKernel('webgl2')
+	});
+})();

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* GPU Accelerated JavaScript`
`6`	`6`	`*`
`7`	`7`	`* @version 1.9.0`
`8`		`- * @date Wed Oct 24 2018 14:09:46 GMT-0400 (EDT)`
	`8`	`+ * @date Wed Oct 24 2018 14:56:50 GMT-0400 (EDT)`
`9`	`9`	`*`
`10`	`10`	`* @license MIT`
`11`	`11`	`* The MIT License`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ module.exports = function (_KernelBase) {`
`287`	`287`	`for (var p in this.constants) {`
`288`	`288`	`var value = this.constants[p];`
`289`	`289`	`var type = utils.getArgumentType(value);`
`290`		`- if (type === 'Decimal' \|\| type === 'Integer') {`
	`290`	`+ if (type === 'Float' \|\| type === 'Integer') {`
`291`	`291`	`continue;`
`292`	`292`	`}`
`293`	`293`	`gl.useProgram(this.program);`
`@@ -942,12 +942,6 @@ module.exports = function (_KernelBase) {`
`942`	`942`	`this.setUniform1i('constants_' + name, this.constantsLength);`
`943`	`943`	`break;`
`944`	`944`	`}`
`945`		`- case 'Integer':`
`946`		`- case 'Float':`
`947`		`- {`
`948`		`- this.setUniform1f('constants_' + name, value);`
`949`		`- break;`
`950`		`- }`
`951`	`945`	`case 'Input':`
`952`	`946`	`{`
`953`	`947`	`var input = value;`
`@@ -1023,6 +1017,8 @@ module.exports = function (_KernelBase) {`
`1023`	`1017`	`this.setUniform1i('constants_' + name, this.constantsLength);`
`1024`	`1018`	`break;`
`1025`	`1019`	`}`
	`1020`	`+ case 'Integer':`
	`1021`	`+ case 'Float':`
`1026`	`1022`	`default:`
`1027`	`1023`	`throw new Error('Input type not supported (WebGL): ' + value);`
`1028`	`1024`	`}`
Original file line number	Diff line number	Diff line change
`@@ -555,12 +555,6 @@ module.exports = function (_WebGLKernel) {`
`555`	`555`	`this.setUniform1i('constants_' + name, this.constantsLength);`
`556`	`556`	`break;`
`557`	`557`	`}`
`558`		`- case 'Integer':`
`559`		`- case 'Float':`
`560`		`- {`
`561`		`- this.setUniform1f('constants_' + name, value);`
`562`		`- break;`
`563`		`- }`
`564`	`558`	`case 'Input':`
`565`	`559`	`{`
`566`	`560`	`var input = value;`
`@@ -668,6 +662,8 @@ module.exports = function (_WebGLKernel) {`
`668`	`662`	`this.setUniform1i('constants_' + name, this.constantsLength);`
`669`	`663`	`break;`
`670`	`664`	`}`
	`665`	`+ case 'Integer':`
	`666`	`+ case 'Float':`
`671`	`667`	`default:`
`672`	`668`	`throw new Error('Input type not supported (WebGL): ' + value);`
`673`	`669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ module.exports = class WebGLKernel extends KernelBase {`
`264`	`264`	`for (let p in this.constants) {`
`265`	`265`	`const value = this.constants[p]`
`266`	`266`	`const type = utils.getArgumentType(value);`
`267`		`- if (type === 'Decimal' \|\| type === 'Integer') {`
	`267`	`+ if (type === 'Float' \|\| type === 'Integer') {`
`268`	`268`	`continue;`
`269`	`269`	`}`
`270`	`270`	`gl.useProgram(this.program);`
`@@ -904,12 +904,6 @@ module.exports = class WebGLKernel extends KernelBase {`
`904`	`904`	this.setUniform1i(`constants_${name}`, this.constantsLength);
`905`	`905`	`break;`
`906`	`906`	`}`
`907`		`- case 'Integer':`
`908`		`- case 'Float':`
`909`		`- {`
`910`		- this.setUniform1f(`constants_${name}`, value);
`911`		`- break;`
`912`		`- }`
`913`	`907`	`case 'Input':`
`914`	`908`	`{`
`915`	`909`	`const input = value;`
`@@ -990,6 +984,8 @@ module.exports = class WebGLKernel extends KernelBase {`
`990`	`984`	this.setUniform1i(`constants_${name}`, this.constantsLength);
`991`	`985`	`break;`
`992`	`986`	`}`
	`987`	`+ case 'Integer':`
	`988`	`+ case 'Float':`
`993`	`989`	`default:`
`994`	`990`	`throw new Error('Input type not supported (WebGL): ' + value);`
`995`	`991`	`}`