Revert "WebGPURenderer: CubeTexture support"

This reverts commit 6c62b26.

Author: sunag

examples/jsm/renderers/webgpu/WebGPUTextureUtils.js

@@ -123,7 +123,7 @@ fn main( @location( 0 ) vTex : vec2<f32> ) -> @location( 0 ) vec4<f32> {
 
 	}
 
-	generateMipmaps( textureGPU, textureGPUDescriptor, baseArrayLayer = 1, mipLevelOffset = 1 ) {
+	generateMipmaps( textureGPU, textureGPUDescriptor ) {
 
 		const pipeline = this.getMipmapPipeline( textureGPUDescriptor.format );
 
@@ -135,12 +135,11 @@ fn main( @location( 0 ) vTex : vec2<f32> ) -> @location( 0 ) vec4<f32> {
 			mipLevelCount: 1
 		} );
 
-		for ( let i = mipLevelOffset; i < textureGPUDescriptor.mipLevelCount; i ++ ) {
+		for ( let i = 1; i < textureGPUDescriptor.mipLevelCount; i ++ ) {
 
 			const dstView = textureGPU.createView( {
 				baseMipLevel: i,
-				mipLevelCount: 1,
-				baseArrayLayer
+				mipLevelCount: 1
 			} );
 
 			const passEncoder = commandEncoder.beginRenderPass( {

examples/jsm/renderers/webgpu/WebGPUTextures.js

@@ -361,11 +361,7 @@ class WebGPUTextures {
 
 		} else if ( texture.isCubeTexture ) {
 
-			if ( image.length === 6 ) {
-
-				this._copyCubeMapToTexture( image, texture, textureGPU, textureGPUDescriptor, needsMipmaps );
-
-			}
+			this._copyCubeMapToTexture( image, texture, textureGPU );
 
 		} else {
 
@@ -419,17 +415,15 @@ class WebGPUTextures {
 
 	}
 
-	_copyCubeMapToTexture( images, texture, textureGPU, textureGPUDescriptor, needsMipmaps ) {
+	_copyCubeMapToTexture( images, texture, textureGPU ) {
 
-		for ( let i = 5; i >= 0; i -- ) {
+		for ( let i = 0; i < images.length; i ++ ) {
 
 			const image = images[ i ];
 
 			this._getImageBitmap( image, texture ).then( imageBitmap => {
 
-				this._copyExternalImageToTexture( imageBitmap, textureGPU );
-
-				if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor, i, i > 0 ? 0 : 1 );
+				this._copyExternalImageToTexture( imageBitmap, textureGPU, { x: 0, y: 0, z: i } );
 
 			} );
 
@@ -445,7 +439,7 @@ class WebGPUTextures {
 			}, {
 				texture: textureGPU,
 				mipLevel: 0,
-				origin
+				origin: origin
 			}, {
 				width: image.width,
 				height: image.height,
@@ -483,22 +477,22 @@ class WebGPUTextures {
 				{
 					width: Math.ceil( width / blockData.width ) * blockData.width,
 					height: Math.ceil( height / blockData.width ) * blockData.width,
-					depthOrArrayLayers: 1
+					depthOrArrayLayers: 1,
 				} );
 
 		}
 
 	}
 
-	_generateMipmaps( textureGPU, textureGPUDescriptor, baseArrayLayer, mipLevelOffset ) {
+	_generateMipmaps( textureGPU, textureGPUDescriptor ) {
 
 		if ( this.utils === null ) {
 
 			this.utils = new WebGPUTextureUtils( this.device ); // only create this helper if necessary
 
 		}
 
-		this.utils.generateMipmaps( textureGPU, textureGPUDescriptor, baseArrayLayer, mipLevelOffset );
+		this.utils.generateMipmaps( textureGPU, textureGPUDescriptor );
 
 	}
 

examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js

@@ -6,7 +6,7 @@ import {
 	ColorNodeUniform, Matrix3NodeUniform, Matrix4NodeUniform
 } from './WebGPUNodeUniform.js';
 import WebGPUNodeSampler from './WebGPUNodeSampler.js';
-import { WebGPUNodeSampledTexture, WebGPUNodeSampledCubeTexture } from './WebGPUNodeSampledTexture.js';
+import { WebGPUNodeSampledTexture } from './WebGPUNodeSampledTexture.js';
 
 import WebGPUUniformBuffer from '../WebGPUUniformBuffer.js';
 import { getVectorLength, getStrideLength } from '../WebGPUBufferUtils.js';
@@ -33,27 +33,27 @@ const wgslTypeLib = {
 	int: 'i32',
 	uint: 'u32',
 	bool: 'bool',
-
+	
 	vec2: 'vec2<f32>',
 	ivec2: 'vec2<i32>',
 	uvec2: 'vec2<u32>',
 	bvec2: 'vec2<bool>',
-
+	
 	vec3: 'vec3<f32>',
 	ivec3: 'vec3<i32>',
 	uvec3: 'vec3<u32>',
 	bvec3: 'vec3<bool>',
-
+	
 	vec4: 'vec4<f32>',
 	ivec4: 'vec4<i32>',
 	uvec4: 'vec4<u32>',
 	bvec4: 'vec4<bool>',
-
+	
 	mat3: 'mat3x3<f32>',
 	imat3: 'mat3x3<i32>',
 	umat3: 'mat3x3<u32>',
 	bmat3: 'mat3x3<bool>',
-
+	
 	mat4: 'mat4x4<f32>',
 	imat4: 'mat4x4<i32>',
 	umat4: 'mat4x4<u32>',
@@ -362,7 +362,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 	}
 
-	getSampler( textureProperty, uvSnippet, shaderStage = this.shaderStage ) {
+	getTexture( textureProperty, uvSnippet, biasSnippet, shaderStage = this.shaderStage ) {
 
 		if ( shaderStage === 'fragment' ) {
 
@@ -380,18 +380,6 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 	}
 
-	getTexture( textureProperty, uvSnippet, shaderStage = this.shaderStage ) {
-
-		return this.getSampler( textureProperty, uvSnippet, shaderStage );
-
-	}
-
-	getCubeTexture( textureProperty, uvSnippet, shaderStage = this.shaderStage ) {
-
-		return this.getSampler( textureProperty, uvSnippet, shaderStage );
-
-	}
-
 	getPropertyName( node, shaderStage = this.shaderStage ) {
 
 		if ( node.isNodeVary === true ) {
@@ -407,7 +395,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 			const name = node.name;
 			const type = node.type;
 
-			if ( type === 'texture' || type === 'cubeTexture' ) {
+			if ( type === 'texture' ) {
 
 				return name;
 
@@ -446,21 +434,10 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 			const bindings = this.bindings[ shaderStage ];
 
-			if ( type === 'texture' || type === 'cubeTexture' ) {
+			if ( type === 'texture' ) {
 
 				const sampler = new WebGPUNodeSampler( `${uniformNode.name}_sampler`, uniformNode.node );
-
-				let texture = null;
-
-				if ( type === 'texture' ) {
-
-					texture = new WebGPUNodeSampledTexture( uniformNode.name, uniformNode.node );
-
-				} else if ( type === 'cubeTexture' ) {
-
-					texture = new WebGPUNodeSampledCubeTexture( uniformNode.name, uniformNode.node );
-
-				}
+				const texture = new WebGPUNodeSampledTexture( uniformNode.name, uniformNode.node );
 
 				// add first textures in sequence and group for last
 				const lastBinding = bindings[ bindings.length - 1 ];
@@ -478,6 +455,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 					uniformGPU = [ texture ];
 
+
 				}
 
 
@@ -674,16 +652,6 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 				snippet += `@group( 0 ) @binding( ${index ++} ) var ${uniform.name} : texture_2d<f32>; `;
 
-			} else if ( uniform.type === 'cubeTexture' ) {
-
-				if ( shaderStage === 'fragment' ) {
-
-					snippet += `@group( 0 ) @binding( ${index ++} ) var ${uniform.name}_sampler : sampler; `;
-
-				}
-
-				snippet += `@group( 0 ) @binding( ${index ++} ) var ${uniform.name} : texture_cube<f32>; `;
-
 			} else if ( uniform.type === 'buffer' ) {
 
 				const bufferNode = uniform.node;