@gnsx/three 0.185.4 → 0.185.6

package/examples/jsm/lighting/LightProbeGrid.js

@@ -33,6 +33,7 @@ import {
 	storageTexture,
 	textureStore,
 	uniform,
+	uint,
 	uvec3,
 	vec3,
 	vec4
@@ -102,11 +103,11 @@ const ATLAS_PADDING = 1;
  * Atlas layout (nz = resolution.z, PADDING = 1):
  * ```
  *   slice   0              : padding  (copy of sub-volume 0, data slice 0)
- *   slices  1 �? nz         : sub-volume 0 data
+ *   slices  1 to nz        : sub-volume 0 data
  *   slice   nz + 1         : padding  (copy of sub-volume 0, data slice nz-1)
  *   slice   nz + 2         : padding  (copy of sub-volume 1, data slice 0)
- *   slices  nz+3 �? 2*nz+2  : sub-volume 1 data
- *   �?
+ *   slices  nz+3 to 2*nz+2 : sub-volume 1 data
+ *   ...
  * ```
  * Total atlas depth = `7 * ( nz + 2 )`.
  *
@@ -279,7 +280,7 @@ class LightProbeGrid extends Object3D {
 	/**
 	 * Bakes all probes by rendering cubemaps at each probe position
 	 * and projecting to L2 SH. Optionally iterates additional passes to
-	 * capture indirect bounces �? each extra pass samples the previous pass's
+	 * capture indirect bounces - each extra pass samples the previous pass's
 	 * atlas as indirect light, so a grid added to the scene before baking
 	 * accumulates one bounce per extra pass.
 	 *
@@ -328,7 +329,7 @@ class LightProbeGrid extends Object3D {
 		renderer.getScissor( _currentScissor );
 		const currentScissorTest = renderer.getScissorTest();
 
-		// Scene is static across the bake �? update once and disable per-render auto updates.
+		// Scene is static across the bake - update once and disable per-render auto updates.
 		const currentMatrixWorldAutoUpdate = scene.matrixWorldAutoUpdate;
 		if ( currentMatrixWorldAutoUpdate === true ) {
 
@@ -337,7 +338,7 @@ class LightProbeGrid extends Object3D {
 
 		}
 
-		// Disable shadow map auto-update across all passes �? lights don't move.
+		// Disable shadow map auto-update across all passes - lights don't move.
 		// Force a single shadow update on the first render so maps are initialized.
 		const currentShadowAutoUpdate = renderer.shadowMap.autoUpdate;
 		renderer.shadowMap.autoUpdate = false;
@@ -351,7 +352,7 @@ class LightProbeGrid extends Object3D {
 		// const t0 = performance.now();
 
 		// Pass 0 captures direct light only (grid hidden, so probesSH is not sampled
-		// �? the atlas at this point may be uninitialized or hold a prior bake).
+		// the atlas at this point may be uninitialized or hold a prior bake).
 		// Each subsequent pass keeps the grid visible so the cube cameras read the
 		// previous pass's atlas as indirect light, accumulating one bounce per pass.
 		// Phase 1 writes to the batch target and Phase 2 only swaps it into the atlas
@@ -439,11 +440,11 @@ class LightProbeGrid extends Object3D {
 
 		}
 
-		// Phase 2: Repack SH data from batch target into the atlas 3D texture (GPU-to-GPU).
+		// Phase 2: Repack SH data from batch target into the atlas 3D texture on the GPU.
 		//
 		// For each of the 7 packed sub-volumes (texture index t) we write:
 		//   - A leading padding slice  (copy of data slice iz = 0)
-		//   - All nz data slices       (iz = 0 �? nz-1)
+		//   - All nz data slices       (iz = 0 to nz-1)
 		//   - A trailing padding slice (copy of data slice iz = nz-1)
 		//
 		// In the atlas the slices for sub-volume t occupy the range:
@@ -675,31 +676,6 @@ class LightProbeGrid extends Object3D {
 
 		renderer.shadowMap.autoUpdate = savedShadowAutoUpdate;
 
-		// Padding slices (GPU-to-GPU copy of nearest edge data slices).
-		const atlas = this.texture;
-
-		for ( let textureIndex = 0; textureIndex < 7; textureIndex ++ ) {
-
-			const baseSlice = textureIndex * paddedSlices;
-			const dataSlice = baseSlice + ATLAS_PADDING;
-			const trailingSlice = dataSlice + nz;
-
-			renderer.copyTextureToTexture(
-				atlas,
-				atlas,
-				new Box3( new Vector3( 0, 0, dataSlice ), new Vector3( nx, ny, dataSlice + 1 ) ),
-				new Vector3( 0, 0, baseSlice )
-			);
-
-			renderer.copyTextureToTexture(
-				atlas,
-				atlas,
-				new Box3( new Vector3( 0, 0, dataSlice + nz - 1 ), new Vector3( nx, ny, dataSlice + nz ) ),
-				new Vector3( 0, 0, trailingSlice )
-			);
-
-		}
-
 		await renderer.backend.device.queue.onSubmittedWorkDone();
 
 	}
@@ -1142,7 +1118,7 @@ function _ensureWebGPUComputeResources( cubemapSize, envMapTexture, atlasTexture
 				totalWeight.addAssign( weight );
 
 				const dir = coord.normalize();
-				// Pass explicit direction �? omitting UV would default to reflectVector (needs camera).
+				// Pass explicit direction; omitting UV would default to reflectVector (needs camera).
 				const cw = cubeTexture( envMapTexture, coord ).rgb.mul( weight );
 
 				accum0.addAssign( cw.mul( 0.282095 ) );
@@ -1172,35 +1148,56 @@ function _ensureWebGPUComputeResources( cubemapSize, envMapTexture, atlasTexture
 
 		Loop( { end: 7, name: 't', type: 'int' }, ( { t } ) => {
 
-			const atlasZ = paddedSlices.mul( t ).add( 1 ).add( probeIz );
+			const baseSlice = paddedSlices.mul( t );
+			const atlasZ = baseSlice.add( 1 ).add( probeIz );
+			const trailingSlice = baseSlice.add( paddedSlices ).sub( 1 );
+			const lastDataSlice = paddedSlices.sub( 3 );
+			const storeProbeValue = ( value ) => {
+
+				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), value ).toWriteOnly();
+
+				// Write padding during the compute pass; WebGPU validation rejects atlas-to-itself copies.
+				If( probeIz.equal( uint( 0 ) ), () => {
+
+					textureStore( atlas, uvec3( probeIx, probeIy, baseSlice ), value ).toWriteOnly();
+
+				} );
+
+				If( probeIz.equal( lastDataSlice ), () => {
+
+					textureStore( atlas, uvec3( probeIx, probeIy, trailingSlice ), value ).toWriteOnly();
+
+				} );
+
+			};
 
 			If( t.equal( int( 0 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c0.x, c0.y, c0.z, c1.x ) ).toWriteOnly();
+				storeProbeValue( vec4( c0.x, c0.y, c0.z, c1.x ) );
 
 			} ).ElseIf( t.equal( int( 1 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c1.y, c1.z, c2.x, c2.y ) ).toWriteOnly();
+				storeProbeValue( vec4( c1.y, c1.z, c2.x, c2.y ) );
 
 			} ).ElseIf( t.equal( int( 2 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c2.z, c3.x, c3.y, c3.z ) ).toWriteOnly();
+				storeProbeValue( vec4( c2.z, c3.x, c3.y, c3.z ) );
 
 			} ).ElseIf( t.equal( int( 3 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c4.x, c4.y, c4.z, c5.x ) ).toWriteOnly();
+				storeProbeValue( vec4( c4.x, c4.y, c4.z, c5.x ) );
 
 			} ).ElseIf( t.equal( int( 4 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c5.y, c5.z, c6.x, c6.y ) ).toWriteOnly();
+				storeProbeValue( vec4( c5.y, c5.z, c6.x, c6.y ) );
 
 			} ).ElseIf( t.equal( int( 5 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c6.z, c7.x, c7.y, c7.z ) ).toWriteOnly();
+				storeProbeValue( vec4( c6.z, c7.x, c7.y, c7.z ) );
 
 			} ).Else( () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c8.x, c8.y, c8.z, float( 0 ) ) ).toWriteOnly();
+				storeProbeValue( vec4( c8.x, c8.y, c8.z, float( 0 ) ) );
 
 			} );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnsx/three",
-  "version": "0.185.4",
+  "version": "0.185.6",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",

package/src/renderers/webgpu/WebGPUBackend.js

@@ -2267,6 +2267,11 @@ class WebGPUBackend extends Backend {
 
 		const baseOffset = timestampQueryPool.allocateQueriesForContext( uid );
 
+		// WITH_GENESYS
+		// If query allocation fails, leave timestampWrites unset so WebGPU doesn't receive a null querySet.
+		if ( baseOffset === null || timestampQueryPool.querySet === null ) return;
+		// !WITH_GENESYS
+
 		_renderPassTimestampWrites.querySet = timestampQueryPool.querySet;
 		_renderPassTimestampWrites.beginningOfPassWriteIndex = baseOffset;
 		_renderPassTimestampWrites.endOfPassWriteIndex = baseOffset + 1;

package/src/renderers/webgpu/utils/WebGPUTextureUtils.js

@@ -250,6 +250,17 @@ class WebGPUTextureUtils {
 		if ( bindingData.sampler !== undefined ) {
 
 			const samplerData = this._samplerCache.get( bindingData.samplerKey );
+			// WITH_GENESYS
+			// Binding disposal can be reached more than once during renderer teardown; tolerate stale sampler cache data.
+			if ( samplerData === undefined ) {
+
+				bindingData.sampler = undefined;
+				bindingData.samplerKey = undefined;
+				return;
+
+			}
+
+			// !WITH_GENESYS
 			samplerData.usedTimes --;
 
 			if ( samplerData.usedTimes === 0 ) {