WebGPU: Fixes (#23003)

* WGSL: deprecated attribute: [[ block ]] warning: use of deprecated language feature: [[block]] attributes have been removed from WGSL [[ block ]] * fix alpha used in color * fix non-float roughness
mrdoob · Dec 11, 2021 · b31270c · b31270c
1 parent 8f22ee5
commit b31270c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/examples/jsm/renderers/nodes/functions/PhysicalMaterialFunctions.js b/examples/jsm/renderers/nodes/functions/PhysicalMaterialFunctions.js
@@ -18,7 +18,7 @@ export const getRoughness = new ShaderNode( ( inputs ) => {
 
 	const geometryRoughness = getGeometryRoughness();
 
-	let roughnessFactor = max( roughness, 0.0525 ); // 0.0525 corresponds to the base mip of a 256 cubemap.
+	let roughnessFactor = max( roughness.r, 0.0525 ); // 0.0525 corresponds to the base mip of a 256 cubemap.
 	roughnessFactor = add( roughnessFactor, geometryRoughness );
 	roughnessFactor = min( roughnessFactor, 1.0 );
 

diff --git a/examples/jsm/renderers/webgpu/WebGPUTextureUtils.js b/examples/jsm/renderers/webgpu/WebGPUTextureUtils.js
@@ -29,7 +29,6 @@ class WebGPUTextureUtils {
 		this.device = device;
 
 		const mipmapVertexSource = `
-[[ block ]]
 struct VarysStruct {
 
 	[[ builtin( position ) ]] Position: vec4<f32>;

diff --git a/examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js b/examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js
@@ -148,7 +148,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 			}
 
-			colorNode = this.addFlow( 'fragment', new VarNode( colorNode, 'Color', 'vec3' ) );
+			colorNode = this.addFlow( 'fragment', new VarNode( colorNode, 'Color', 'vec4' ) );
 
 			this.addFlow( 'fragment', new VarNode( colorNode, 'DiffuseColor', 'vec4' ) );
 
@@ -232,7 +232,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 				// SPECULAR_TINT
 
-				this.addFlow( 'fragment', new VarNode( new ExpressionNode( 'mix( vec3<f32>( 0.04 ), Color, Metalness )', 'vec3' ), 'SpecularColor', 'color' ) );
+				this.addFlow( 'fragment', new VarNode( new ExpressionNode( 'mix( vec3<f32>( 0.04 ), Color.rgb, Metalness )', 'vec3' ), 'SpecularColor', 'color' ) );
 
 				// NORMAL_VIEW
 
@@ -783,7 +783,7 @@ fn main( ${shaderData.varys} ) -> [[ location( 0 ) ]] vec4<f32> {
 
 	_getWGSLStruct( name, vars ) {
 
-		return `[[ block ]]
+		return `
 struct ${name} {
 \n${vars}
 };`;