@gnsx/three 0.185.9 → 0.185.11

package/src/renderers/common/Backend.js

@@ -67,6 +67,15 @@ class Backend {
 			[ TimestampQuery.COMPUTE ]: null
 		};
 
+		// WITH_GENESYS
+		/**
+		 * Listeners notified after a timestamp query is successfully allocated.
+		 *
+		 * @type {Set<function(string, string, ?string): void>}
+		 */
+		this.timestampQueryListeners = new Set();
+		// !WITH_GENESYS
+
 		/**
 		 * Whether to track timestamps with a Timestamp Query API or not.
 		 *
@@ -505,6 +514,41 @@ class Backend {
 
 	}
 
+	// WITH_GENESYS
+	/**
+	 * @param {function(string, string, ?string): void} listener
+	 */
+	addTimestampQueryListener( listener ) {
+
+		this.timestampQueryListeners.add( listener );
+
+	}
+
+	/**
+	 * @param {function(string, string, ?string): void} listener
+	 */
+	removeTimestampQueryListener( listener ) {
+
+		this.timestampQueryListeners.delete( listener );
+
+	}
+
+	/**
+	 * @param {string} type
+	 * @param {string} uid
+	 * @param {?string} [label=null]
+	 */
+	notifyTimestampQuery( type, uid, label = null ) {
+
+		for ( const listener of this.timestampQueryListeners ) {
+
+			listener( type, uid, label );
+
+		}
+
+	}
+	// !WITH_GENESYS
+
 	/**
 	 * Returns all timestamp frames for the given type.
 	 *
@@ -548,6 +592,22 @@ class Backend {
 
 	}
 
+	// WITH_GENESYS
+	/**
+	 * Returns the raw GPU timestamp range for the given uid when supported.
+	 *
+	 * @param {string} uid - The unique identifier.
+	 * @return {?{start: bigint, end: bigint}} The raw timestamp range.
+	 */
+	getTimestampRange( uid ) {
+
+		const queryPool = this._getQueryPool( uid );
+
+		return queryPool.getTimestampRange( uid );
+
+	}
+	// !WITH_GENESYS
+
 	/**
 	 * Whether the backend supports query timestamps or not.
 	 *

package/src/renderers/common/RenderContext.js

@@ -230,6 +230,16 @@ class RenderContext {
 		 */
 		this.camera = null;
 
+		// WITH_GENESYS
+		/**
+		 * An optional label used to identify this render pass in GPU profiler output.
+		 *
+		 * @type {?string}
+		 * @default null
+		 */
+		this.gpuProfilerLabel = null;
+		// !WITH_GENESYS
+
 		/**
 		 * This flag can be used for type testing.
 		 *

package/src/renderers/common/Renderer.js

@@ -1617,6 +1617,25 @@ class Renderer {
 
 		const renderContext = this._renderContexts.get( renderTarget, this._mrt, this._callDepth );
 
+		// WITH_GENESYS
+		// Prefer an explicit scene/pass name; otherwise fall back to the render
+		// target texture name so depth/shadow/RTT work is not an invisible hole.
+		let gpuProfilerLabel = scene.name !== '' ? scene.name : null;
+		if ( gpuProfilerLabel === null && renderTarget !== null ) {
+
+			const textureName = renderTarget.texture?.name;
+			if ( textureName !== undefined && textureName !== null && textureName !== '' ) {
+
+				gpuProfilerLabel = textureName;
+
+			}
+
+		}
+
+		renderContext.gpuProfilerLabel = gpuProfilerLabel;
+		// !WITH_GENESYS
+		// renderContext.gpuProfilerLabel = scene.name !== '' ? scene.name : null;
+
 		this._currentRenderContext = renderContext;
 		this._currentRenderObjectFunction = this._renderObjectFunction || this.renderObject;
 		this._handleObjectFunction = this._renderObjectDirect;
@@ -2616,7 +2635,7 @@ class Renderer {
 
 			// WITH_GENESYS
 			// Drop the strong reference to the active `RenderContext` so module-level
-			// `WeakMap<RenderContext, �?>` caches can release entries once
+			// `WeakMap<RenderContext, ...>` caches can release entries once
 			// `_renderContexts.dispose()` has cleared its dictionary.
 			this._currentRenderContext = null;
 			// !WITH_GENESYS

package/src/renderers/common/TimestampQueryPool.js

@@ -85,6 +85,15 @@ class TimestampQueryPool {
 		 */
 		this.timestamps = new Map();
 
+		// WITH_GENESYS
+		/**
+		 * Stores raw GPU timestamp ranges for each render context when supported.
+		 *
+		 * @type {Map<string, {start: bigint, end: bigint}>}
+		 */
+		this.timestampRanges = new Map();
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -120,6 +129,20 @@ class TimestampQueryPool {
 
 	}
 
+	// WITH_GENESYS
+	/**
+	 * Returns the raw GPU timestamp range for a render context.
+	 *
+	 * @param {string} uid - A unique identifier for the render context.
+	 * @return {?{start: bigint, end: bigint}} The raw timestamp range, or null when unsupported.
+	 */
+	getTimestampRange( uid ) {
+
+		return this.timestampRanges.get( uid ) ?? null;
+
+	}
+	// !WITH_GENESYS
+
 	/**
 	 * Returns whether a timestamp is available for a given render context.
 	 *

package/src/renderers/webgl-fallback/WebGLBackend.js

@@ -407,7 +407,11 @@ class WebGLBackend extends Backend {
 	 * @param {string} type - The type of the timestamp query.
 	 * @param {string} uid - A unique identifier for the timestamp query.
 	 */
-	initTimestampQuery( type, uid ) {
+	// WITH_GENESYS
+	initTimestampQuery( type, uid, label = null ) {
+
+		// !WITH_GENESYS
+		// initTimestampQuery( type, uid ) {
 
 		if ( ! this.disjoint || ! this.trackTimestamp ) return;
 
@@ -424,7 +428,11 @@ class WebGLBackend extends Backend {
 
 		if ( baseOffset !== null ) {
 
-			timestampQueryPool.beginQuery( uid );
+			const started = timestampQueryPool.beginQuery( uid );
+
+			// WITH_GENESYS
+			if ( started ) this.notifyTimestampQuery( type, uid, label );
+			// !WITH_GENESYS
 
 		}
 
@@ -497,7 +505,10 @@ class WebGLBackend extends Backend {
 
 		//
 
-		this.initTimestampQuery( TimestampQuery.RENDER, this.getTimestampUID( renderContext ) );
+		// WITH_GENESYS
+		this.initTimestampQuery( TimestampQuery.RENDER, this.getTimestampUID( renderContext ), renderContext.gpuProfilerLabel );
+		// !WITH_GENESYS
+		// this.initTimestampQuery( TimestampQuery.RENDER, this.getTimestampUID( renderContext ) );
 
 		renderContextData.previousContext = this._currentContext;
 		this._currentContext = renderContext;

package/src/renderers/webgl-fallback/utils/WebGLTimestampQueryPool.js

@@ -81,33 +81,34 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
 	 * Begins a timestamp query for the specified render context.
 	 *
 	 * @param {string} uid - A unique identifier for the render context.
+	 * @return {boolean} Whether the query was started.
 	 */
 	beginQuery( uid ) {
 
 		if ( ! this.trackTimestamp || this.isDisposed ) {
 
-			return;
+			return false;
 
 		}
 
 		const baseOffset = this.queryOffsets.get( uid );
 		if ( baseOffset == null ) {
 
-			return;
+			return false;
 
 		}
 
 		// Don't start a new query if there's an active one
 		if ( this.activeQuery !== null ) {
 
-			return;
+			return false;
 
 		}
 
 		const query = this.queries[ baseOffset ];
 		if ( ! query ) {
 
-			return;
+			return false;
 
 		}
 
@@ -119,6 +120,7 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
 				this.gl.beginQuery( this.ext.TIME_ELAPSED_EXT, query );
 				this.activeQuery = baseOffset;
 				this.queryStates.set( baseOffset, 'started' );
+				return true;
 
 			}
 
@@ -130,6 +132,8 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
 
 		}
 
+		return false;
+
 	}
 
 	/**

package/src/renderers/webgpu/WebGPUBackend.js

@@ -25,7 +25,7 @@ import GPUShaderModuleDescriptor from './descriptors/GPUShaderModuleDescriptor.j
 import GPURenderPassColorAttachment from './descriptors/GPURenderPassColorAttachment.js';
 import GPURenderPassDepthStencilAttachment from './descriptors/GPURenderPassDepthStencilAttachment.js';
 import GPURenderPassDescriptor from './descriptors/GPURenderPassDescriptor.js';
-import GPURenderPassTimestampWrites from './descriptors/GPURenderPassTimestampWrites.js';
+// import GPURenderPassTimestampWrites from './descriptors/GPURenderPassTimestampWrites.js';
 import GPUTexelCopyTextureInfo from './descriptors/GPUTexelCopyTextureInfo.js';
 import GPUTextureViewDescriptor from './descriptors/GPUTextureViewDescriptor.js';
 import GPUExtent3D from './descriptors/GPUExtent3D.js';
@@ -36,7 +36,7 @@ const _commandEncoderDescriptor = new GPUCommandEncoderDescriptor();
 const _computePassDescriptor = new GPUComputePassDescriptor();
 const _querySetDescriptor = new GPUQuerySetDescriptor();
 const _shaderModuleDescriptor = new GPUShaderModuleDescriptor();
-const _renderPassTimestampWrites = new GPURenderPassTimestampWrites();
+// const _renderPassTimestampWrites = new GPURenderPassTimestampWrites();
 const _texelCopyTextureInfoSrc = new GPUTexelCopyTextureInfo();
 const _texelCopyTextureInfoDst = new GPUTexelCopyTextureInfo();
 const _viewDescriptor = new GPUTextureViewDescriptor();
@@ -836,7 +836,10 @@ class WebGPUBackend extends Backend {
 
 		}
 
-		this.initTimestampQuery( TimestampQuery.RENDER, this.getTimestampUID( renderContext ), descriptor );
+		// WITH_GENESYS
+		this.initTimestampQuery( TimestampQuery.RENDER, this.getTimestampUID( renderContext ), descriptor, renderContext.gpuProfilerLabel );
+		// !WITH_GENESYS
+		// this.initTimestampQuery( TimestampQuery.RENDER, this.getTimestampUID( renderContext ), descriptor );
 
 		descriptor.occlusionQuerySet = occlusionQuerySet;
 
@@ -2252,7 +2255,11 @@ class WebGPUBackend extends Backend {
 	 * @param {number} uid - Unique id for the context (e.g. render context id).
 	 * @param {Object} descriptor - The query descriptor.
 	 */
-	initTimestampQuery( type, uid, descriptor ) {
+	// WITH_GENESYS
+	initTimestampQuery( type, uid, descriptor, label = null ) {
+
+		// !WITH_GENESYS
+		// initTimestampQuery( type, uid, descriptor ) {
 
 		if ( ! this.trackTimestamp ) return;
 
@@ -2272,11 +2279,22 @@ class WebGPUBackend extends Backend {
 		if ( baseOffset === null || timestampQueryPool.querySet === null ) return;
 		// !WITH_GENESYS
 
-		_renderPassTimestampWrites.querySet = timestampQueryPool.querySet;
-		_renderPassTimestampWrites.beginningOfPassWriteIndex = baseOffset;
-		_renderPassTimestampWrites.endOfPassWriteIndex = baseOffset + 1;
+		// WITH_GENESYS
+		// Per-pass object: a shared descriptor is mutated by nested beginRender /
+		// copyFramebuffer restarts and can make unrelated passes write the same
+		// query indices (shadow maps collapsing to ~1µs is the common symptom).
+		descriptor.timestampWrites = {
+			querySet: timestampQueryPool.querySet,
+			beginningOfPassWriteIndex: baseOffset,
+			endOfPassWriteIndex: baseOffset + 1,
+		};
 
-		descriptor.timestampWrites = _renderPassTimestampWrites;
+		this.notifyTimestampQuery( type, uid, label );
+		// !WITH_GENESYS
+		// _renderPassTimestampWrites.querySet = timestampQueryPool.querySet;
+		// _renderPassTimestampWrites.beginningOfPassWriteIndex = baseOffset;
+		// _renderPassTimestampWrites.endOfPassWriteIndex = baseOffset + 1;
+		// descriptor.timestampWrites = _renderPassTimestampWrites;
 
 	}
 
@@ -2837,6 +2855,17 @@ class WebGPUBackend extends Backend {
 			if ( renderContext.depth ) descriptor.depthStencilAttachment.depthLoadOp = GPULoadOp.Load;
 			if ( renderContext.stencil ) descriptor.depthStencilAttachment.stencilLoadOp = GPULoadOp.Load;
 
+			// WITH_GENESYS
+			// Restarted passes need fresh timestamp slots; reusing the previous
+			// timestampWrites overwrites the first segment's query results.
+			this.initTimestampQuery(
+				TimestampQuery.RENDER,
+				this.getTimestampUID( renderContext ),
+				descriptor,
+				renderContext.gpuProfilerLabel
+			);
+			// !WITH_GENESYS
+
 			renderContextData.currentPass = encoder.beginRenderPass( descriptor );
 			renderContextData.currentSets = { attributes: {}, bindingGroups: [], pipeline: null, index: null };
 

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

@@ -78,7 +78,20 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
 		const baseOffset = this.currentQueryIndex;
 		this.currentQueryIndex += 2;
 
-		this.queryOffsets.set( uid, baseOffset );
+		// WITH_GENESYS
+		// One logical uid can own multiple GPU passes (nested interrupt /
+		// copyFramebuffer restart). Keep every offset; resolve sums them.
+		let offsets = this.queryOffsets.get( uid );
+		if ( offsets === undefined ) {
+
+			offsets = [];
+			this.queryOffsets.set( uid, offsets );
+
+		}
+
+		offsets.push( baseOffset );
+		// !WITH_GENESYS
+		// this.queryOffsets.set( uid, baseOffset );
 
 		return baseOffset;
 
@@ -200,7 +213,7 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
 
 			const frames = [];
 
-			for ( const [ uid, baseOffset ] of currentOffsets ) {
+			for ( const [ uid, offsetOrOffsets ] of currentOffsets ) {
 
 				const match = uid.match( /^(.*):f(\d+)$/ );
 				const frame = parseInt( match[ 2 ] );
@@ -213,11 +226,34 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
 
 				if ( framesDuration[ frame ] === undefined ) framesDuration[ frame ] = 0;
 
-				const startTime = times[ baseOffset ];
-				const endTime = times[ baseOffset + 1 ];
-				const duration = Number( endTime - startTime ) / 1e6;
+				// WITH_GENESYS
+				const offsets = Array.isArray( offsetOrOffsets ) ? offsetOrOffsets : [ offsetOrOffsets ];
+				let duration = 0;
+				let rangeStart = null;
+				let rangeEnd = null;
+
+				for ( const baseOffset of offsets ) {
+
+					const startTime = times[ baseOffset ];
+					const endTime = times[ baseOffset + 1 ];
+					duration += Number( endTime - startTime ) / 1e6;
+
+					if ( rangeStart === null || startTime < rangeStart ) rangeStart = startTime;
+					if ( rangeEnd === null || endTime > rangeEnd ) rangeEnd = endTime;
+
+				}
 
 				this.timestamps.set( uid, duration );
+				if ( rangeStart !== null && rangeEnd !== null ) {
+
+					this.timestampRanges.set( uid, { start: rangeStart, end: rangeEnd } );
+
+				}
+				// !WITH_GENESYS
+				// const startTime = times[ baseOffset ];
+				// const endTime = times[ baseOffset + 1 ];
+				// const duration = Number( endTime - startTime ) / 1e6;
+				// this.timestamps.set( uid, duration );
 
 				framesDuration[ frame ] += duration;
 
@@ -316,6 +352,9 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
 		}
 
 		this.queryOffsets.clear();
+		// WITH_GENESYS
+		this.timestampRanges.clear();
+		// !WITH_GENESYS
 		this.pendingResolve = null;
 
 	}