Skip to content

[pull] dev from mrdoob:dev #1122

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 6 commits into from
Jan 31, 2026
Merged

[pull] dev from mrdoob:dev #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ea832d
Examples: Various fixes for WebGPU compatibility mode. (#32907)
greggman Jan 31, 2026
6320341
BindGroup: Remove `bindingsReference`. (#32910)
Mugen87 Jan 31, 2026
4c280ff
Update package.json
Mugen87 Jan 31, 2026
3332b33
Update package.json
Mugen87 Jan 31, 2026
f2beb96
WebGPURenderer: Make generateMipmap work in compatibility mode (#32906)
greggman Jan 31, 2026
686e56a
NodeBuilder: Fix shared group detection. (#32913)
Mugen87 Jan 31, 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 examples/webgpu_compute_birds.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@

//

renderer = new THREE.WebGPURenderer( { antialias: true, forceWebGL: false } );
renderer = new THREE.WebGPURenderer( { antialias: true, forceWebGL: false, requiredLimits: { maxStorageBuffersInVertexStage: 3 } } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.setAnimationLoop( render );
Expand Down
2 changes: 1 addition & 1 deletion examples/webgpu_compute_cloth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

async function init() {

renderer = new THREE.WebGPURenderer( { antialias: true } );
renderer = new THREE.WebGPURenderer( { antialias: true, requiredLimits: { maxStorageBuffersInVertexStage: 1 } } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.toneMapping = THREE.NeutralToneMapping;
Expand Down
2 changes: 1 addition & 1 deletion examples/webgpu_compute_particles_fluid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

async function init() {

renderer = new THREE.WebGPURenderer( { antialias: true } );
renderer = new THREE.WebGPURenderer( { antialias: true, requiredLimits: { maxStorageBuffersInVertexStage: 1 } } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.toneMapping = THREE.ACESFilmicToneMapping;
Expand Down
2 changes: 1 addition & 1 deletion examples/webgpu_compute_points.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
mesh.count = particlesCount;
scene.add( mesh );

renderer = new THREE.WebGPURenderer( { antialias: true } );
renderer = new THREE.WebGPURenderer( { antialias: true, requiredLimits: { maxStorageBuffersInVertexStage: 1 } } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.setAnimationLoop( animate );
Expand Down
2 changes: 1 addition & 1 deletion examples/webgpu_compute_water.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
const duckMesh = new THREE.InstancedMesh( duckModel.geometry, duckModel.material, NUM_DUCKS );
scene.add( duckMesh );

renderer = new THREE.WebGPURenderer( { antialias: true } );
renderer = new THREE.WebGPURenderer( { antialias: true, requiredLimits: { maxStorageBuffersInVertexStage: 2 } } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.toneMapping = THREE.ACESFilmicToneMapping;
Expand Down
2 changes: 1 addition & 1 deletion examples/webgpu_mrt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

// renderer

renderer = new THREE.WebGPURenderer( { antialias: true } );
renderer = new THREE.WebGPURenderer( { antialias: true, requiredLimits: { maxColorAttachments: 5 } } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.setAnimationLoop( render );
Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,11 @@
"lint-addons": "eslint examples/jsm",
"lint-examples": "eslint examples",
"lint-editor": "eslint editor",
"lint-playground": "eslint playground",
"lint-manual": "eslint manual",
"lint-test": "eslint test",
"lint-utils": "eslint utils",
"lint": "npm run lint-core",
"lint-fix": "npm run lint-core -- --fix && npm run lint-addons -- --fix && npm run lint-examples -- --fix && npm run lint-docs -- --fix && npm run lint-editor -- --fix && npm run lint-playground -- --fix && npm run lint-manual -- --fix && npm run lint-test -- --fix && npm run lint-utils -- --fix",
"lint-fix": "npm run lint-core -- --fix && npm run lint-addons -- --fix && npm run lint-examples -- --fix && npm run lint-editor -- --fix && npm run lint-manual -- --fix && npm run lint-test -- --fix && npm run lint-utils -- --fix",
"test-unit": "qunit test/unit/three.source.unit.js",
"test-unit-addons": "qunit test/unit/three.addons.unit.js",
"test-e2e": "node test/e2e/puppeteer.js",
Expand Down
6 changes: 3 additions & 3 deletions src/nodes/core/NodeBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ class NodeBuilder {

bindingsArray.push( binding );

sharedGroup = sharedGroup && binding.groupNode.shared !== true;
sharedGroup = sharedGroup && binding.groupNode.shared;

}

Expand All @@ -598,15 +598,15 @@ class NodeBuilder {

if ( bindGroup === undefined ) {

bindGroup = new BindGroup( groupName, bindingsArray, this.bindingsIndexes[ groupName ].group, bindingsArray );
bindGroup = new BindGroup( groupName, bindingsArray, this.bindingsIndexes[ groupName ].group );

bindGroupsCache.set( bindingsArray, bindGroup );

}

} else {

bindGroup = new BindGroup( groupName, bindingsArray, this.bindingsIndexes[ groupName ].group, bindingsArray );
bindGroup = new BindGroup( groupName, bindingsArray, this.bindingsIndexes[ groupName ].group );

}

Expand Down
10 changes: 1 addition & 9 deletions src/renderers/common/BindGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ class BindGroup {
* @param {string} name - The bind group's name.
* @param {Array<Binding>} bindings - An array of bindings.
* @param {number} index - The group index.
* @param {Array<Binding>} bindingsReference - An array of reference bindings.
*/
constructor( name = '', bindings = [], index = 0, bindingsReference = [] ) {
constructor( name = '', bindings = [], index = 0 ) {

/**
* The bind group's name.
Expand All @@ -40,13 +39,6 @@ class BindGroup {
*/
this.index = index;

/**
* An array of reference bindings.
*
* @type {Array<Binding>}
*/
this.bindingsReference = bindingsReference;

/**
* The group's ID.
*
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/common/nodes/NodeBuilderState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class NodeBuilderState {

if ( shared !== true ) {

const bindingsGroup = new BindGroup( instanceGroup.name, [], instanceGroup.index, instanceGroup.bindingsReference );
const bindingsGroup = new BindGroup( instanceGroup.name, [], instanceGroup.index );
bindings.push( bindingsGroup );

for ( const instanceBinding of instanceGroup.bindings ) {
Expand Down
Loading