Skip to content

[pull] dev from mrdoob:dev #1259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Apr 5, 2026
Merged

[pull] dev from mrdoob:dev #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ef8f5
WebGPURenderer: Fix WebGPU render bundle reuse across render contexts…
RenaudRohlinger Apr 5, 2026
121bd69
Update Clock.js
Mugen87 Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/Clock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Clock {
*/
this.running = false;

warn( 'THREE.Clock: This module has been deprecated. Please use THREE.Timer instead.' ); // @deprecated, r183
warn( 'Clock: This module has been deprecated. Please use THREE.Timer instead.' ); // @deprecated, r183

}

Expand Down
4 changes: 3 additions & 1 deletion src/renderers/common/RenderBundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ class RenderBundle {
*
* @param {BundleGroup} bundleGroup - The bundle group.
* @param {Camera} camera - The camera the bundle group is rendered with.
* @param {RenderContext} renderContext - The render context the bundle is rendered with.
*/
constructor( bundleGroup, camera ) {
constructor( bundleGroup, camera, renderContext ) {

this.bundleGroup = bundleGroup;
this.camera = camera;
this.renderContext = renderContext;

}

Expand Down
7 changes: 5 additions & 2 deletions src/renderers/common/RenderBundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,29 @@ class RenderBundles {
*
* @param {BundleGroup} bundleGroup - The bundle group.
* @param {Camera} camera - The camera the bundle group is rendered with.
* @param {RenderContext} renderContext - The render context the bundle is rendered with.
* @return {RenderBundle} The render bundle.
*/
get( bundleGroup, camera ) {
get( bundleGroup, camera, renderContext ) {

const bundles = this.bundles;

_chainKeys[ 0 ] = bundleGroup;
_chainKeys[ 1 ] = camera;
_chainKeys[ 2 ] = renderContext;

let bundle = bundles.get( _chainKeys );

if ( bundle === undefined ) {

bundle = new RenderBundle( bundleGroup, camera );
bundle = new RenderBundle( bundleGroup, camera, renderContext );
bundles.set( _chainKeys, bundle );

}

_chainKeys[ 0 ] = null;
_chainKeys[ 1 ] = null;
_chainKeys[ 2 ] = null;

return bundle;

Expand Down
10 changes: 2 additions & 8 deletions src/renderers/common/Renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,17 +1213,11 @@ class Renderer {

//

const renderBundle = this._bundles.get( bundleGroup, camera );
const renderBundle = this._bundles.get( bundleGroup, camera, renderContext );
const renderBundleData = this.backend.get( renderBundle );

if ( renderBundleData.renderContexts === undefined ) renderBundleData.renderContexts = new Set();

//

const needsUpdate = bundleGroup.version !== renderBundleData.version;
const renderBundleNeedsUpdate = renderBundleData.renderContexts.has( renderContext ) === false || needsUpdate;

renderBundleData.renderContexts.add( renderContext );
const renderBundleNeedsUpdate = needsUpdate || renderBundleData.bundleGPU === undefined;

if ( renderBundleNeedsUpdate ) {

Expand Down
Loading