[pull] dev from mrdoob:dev

src/nodes/gpgpu/AtomicFunctionNode.js

@@ -1,6 +1,7 @@
 import Node from '../core/Node.js';
 import { expression } from '../code/ExpressionNode.js';
 import { nodeProxy } from '../tsl/TSLCore.js';
+import { error } from '../../utils.js';
 
 /**
  * `AtomicFunctionNode` represents any function that can operate on atomic variable types
@@ -90,11 +91,17 @@ class AtomicFunctionNode extends Node {
 
 	generate( builder ) {
 
+		const method = this.method;
+
+		if ( builder.shaderStage === 'vertex' ) {
+
+			error( `TSL: "${this.method}" is not supported in the vertex stage.` );
+
+		}
+
 		const properties = builder.getNodeProperties( this );
 		const parents = properties.parents;
 
-		const method = this.method;
-
 		const type = this.getNodeType( builder );
 		const inputType = this.getInputType( builder );
 

src/nodes/gpgpu/BarrierNode.js

@@ -1,3 +1,4 @@
+import { error } from '../../utils.js';
 import Node from '../core/Node.js';
 import { nodeProxy } from '../tsl/TSLCore.js';
 
@@ -35,15 +36,23 @@ class BarrierNode extends Node {
 	generate( builder ) {
 
 		const { scope } = this;
-		const { renderer } = builder;
+		const { renderer, shaderStage } = builder;
+
+		const barrierMethod = `${scope}Barrier`;
+
+		if ( shaderStage !== 'compute' ) {
+
+			error( `TSL: "${barrierMethod}" is not supported in the ${shaderStage} stage and can only be executed in compute.` );
+
+		}
 
 		if ( renderer.backend.isWebGLBackend === true ) {
 
-			builder.addFlowCode( `\t// ${scope}Barrier \n` );
+			builder.addFlowCode( `\t// ${barrierMethod}() \n` );
 
 		} else {
 
-			builder.addLineFlowCode( `${scope}Barrier()`, this );
+			builder.addLineFlowCode( `${barrierMethod}()`, this );
 
 		}
 

src/nodes/gpgpu/ComputeBuiltinNode.js

@@ -110,7 +110,7 @@ class ComputeBuiltinNode extends Node {
 
 		} else {
 
-			warn( `ComputeBuiltinNode: Compute built-in value ${builtinName} can not be accessed in the ${builder.shaderStage} stage` );
+			warn( `TSL: Compute built-in value "${builtinName}" can not be accessed in the ${builder.shaderStage} stage` );
 			return builder.generateConst( nodeType );
 
 		}

src/nodes/gpgpu/SubgroupFunctionNode.js

@@ -1,3 +1,4 @@
+import { error } from '../../utils.js';
 import TempNode from '../core/TempNode.js';
 import { nodeProxyIntent } from '../tsl/TSLCore.js';
 
@@ -99,6 +100,12 @@ class SubgroupFunctionNode extends TempNode {
 
 		const method = this.method;
 
+		if ( builder.shaderStage === 'vertex' ) {
+
+			error( `TSL: "${this.method}" is not supported in the vertex shader stage.` );
+
+		}
+
 		const type = this.getNodeType( builder );
 		const inputType = this.getInputType( builder );
 

src/nodes/gpgpu/WorkgroupInfoNode.js

@@ -1,6 +1,6 @@
 import ArrayElementNode from '../utils/ArrayElementNode.js';
 import Node from '../core/Node.js';
-import { warn } from '../../utils.js';
+import { error, warn } from '../../utils.js';
 import StackTrace from '../core/StackTrace.js';
 
 /**
@@ -209,6 +209,12 @@ class WorkgroupInfoNode extends Node {
 
 	generate( builder ) {
 
+		if ( builder.shaderStage !== 'compute' ) {
+
+			error( 'TSL: "workgroupArray()" can only be executed within the compute shader stage' );
+
+		}
+
 		const name = ( this.name !== '' ) ? this.name : `${this.scope}Array_${this.id}`;
 
 		return builder.getScopedArray( name, this.scope.toLowerCase(), this.bufferType, this.bufferCount );

src/nodes/math/MathNode.js

@@ -2,7 +2,7 @@ import TempNode from '../core/TempNode.js';
 import { sub, mul, div, mod } from './OperatorNode.js';
 import { addMethodChaining, nodeObject, nodeProxyIntent, float, vec2, vec3, vec4, Fn } from '../tsl/TSLCore.js';
 import { WebGLCoordinateSystem, WebGPUCoordinateSystem } from '../../constants.js';
-import { warn } from '../../utils.js';
+import { error } from '../../utils.js';
 
 /**
  * This node represents a variety of mathematical methods available in shaders.
@@ -289,7 +289,7 @@ class MathNode extends TempNode {
 
 				if ( builder.shaderStage !== 'fragment' && ( method === MathNode.DFDX || method === MathNode.DFDY ) ) {
 
-					warn( `TSL: '${ method }' is not supported in the ${ builder.shaderStage } stage.`, this.stackTrace );
+					error( `TSL: '${ method }' is not supported in the ${ builder.shaderStage } stage.`, this.stackTrace );
 
 					method = '/*' + method + '*/';