Skip to content
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

Jump to bottom

WebGPURenderer: instance mesh use binding group instead of attribute #28726

Merged
merged 7 commits into from
Jul 19, 2024
Merged

WebGPURenderer: instance mesh use binding group instead of attribute #28726

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
636abca
feat: make instanceMatrixNode a binding group
z4122 Jun 23, 2024
7b972f5
feat: make instance color binding group
z4122 Jun 23, 2024
f233b63
fix: fix deepscan check
z4122 Jun 23, 2024
da0314c
fix: fix exmaple error
z4122 Jun 24, 2024
107f8c9
Merge remote-tracking branch 'origin/dev' into optimize/optimize_inst…
z4122 Jun 24, 2024
c531d9c
chore: revert instance color
z4122 Jun 29, 2024
25674f9
Merge remote-tracking branch 'origin/dev' into optimize/optimize_inst…
z4122 Jul 7, 2024
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
49 changes: 34 additions & 15 deletions src/nodes/accessors/InstanceNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { normalLocal } from './NormalNode.js';
import { positionLocal } from './PositionNode.js';
import { nodeProxy, vec3, mat3, mat4 } from '../shadernode/ShaderNode.js';
import { NodeUpdateType } from '../core/constants.js';
import { buffer } from '../accessors/BufferNode.js';
import { instanceIndex } from '../core/IndexNode.js';

import { InstancedInterleavedBuffer } from '../../core/InstancedInterleavedBuffer.js';
import { InstancedBufferAttribute } from '../../core/InstancedBufferAttribute.js';
Expand Down Expand Up @@ -32,40 +34,57 @@ class InstanceNode extends Node {
setup( /*builder*/ ) {

let instanceMatrixNode = this.instanceMatrixNode;
let instanceColorNode = this.instanceColorNode;

const instanceMesh = this.instanceMesh;

if ( instanceMatrixNode === null ) {

const instanceAttribute = instanceMesh.instanceMatrix;
const buffer = new InstancedInterleavedBuffer( instanceAttribute.array, 16, 1 );

this.buffer = buffer;
const bufferFn = instanceAttribute.usage === DynamicDrawUsage ? instancedDynamicBufferAttribute : instancedBufferAttribute;
// Both WebGPU and WebGL backends have UBO max limited to 64kb. Matrix count number bigger than 1000 ( 16 * 4 * 1000 = 64kb ) will fallback to attribute.

const instanceBuffers = [
// F.Signature -> bufferAttribute( array, type, stride, offset )
bufferFn( buffer, 'vec4', 16, 0 ),
bufferFn( buffer, 'vec4', 16, 4 ),
bufferFn( buffer, 'vec4', 16, 8 ),
bufferFn( buffer, 'vec4', 16, 12 )
];
if ( instanceMesh.count <= 1000 ) {

instanceMatrixNode = mat4( ...instanceBuffers );
instanceMatrixNode = buffer( instanceAttribute.array, 'mat4', instanceMesh.count ).element( instanceIndex );

} else {

const buffer = new InstancedInterleavedBuffer( instanceAttribute.array, 16, 1 );

this.buffer = buffer;

const bufferFn = instanceAttribute.usage === DynamicDrawUsage ? instancedDynamicBufferAttribute : instancedBufferAttribute;

const instanceBuffers = [
// F.Signature -> bufferAttribute( array, type, stride, offset )
bufferFn( buffer, 'vec4', 16, 0 ),
bufferFn( buffer, 'vec4', 16, 4 ),
bufferFn( buffer, 'vec4', 16, 8 ),
bufferFn( buffer, 'vec4', 16, 12 )
];

instanceMatrixNode = mat4( ...instanceBuffers );

}

this.instanceMatrixNode = instanceMatrixNode;

}

const instanceColorAttribute = instanceMesh.instanceColor;

if ( instanceColorAttribute && this.instanceColorNode === null ) {
if ( instanceColorAttribute && instanceColorNode === null ) {

const buffer = new InstancedBufferAttribute( instanceColorAttribute.array, 3 );

const bufferFn = instanceColorAttribute.usage === DynamicDrawUsage ? instancedDynamicBufferAttribute : instancedBufferAttribute;

this.bufferColor = buffer;
this.instanceColorNode = vec3( bufferFn( buffer, 'vec3', 3, 0 ) );

instanceColorNode = vec3( bufferFn( buffer, 'vec3', 3, 0 ) );

this.instanceColorNode = instanceColorNode;

}

Expand Down Expand Up @@ -98,13 +117,13 @@ class InstanceNode extends Node {

update( /*frame*/ ) {

if ( this.instanceMesh.instanceMatrix.usage !== DynamicDrawUsage && this.instanceMesh.instanceMatrix.version !== this.buffer.version ) {
if ( this.instanceMesh.instanceMatrix.usage !== DynamicDrawUsage && this.buffer != null && this.instanceMesh.instanceMatrix.version !== this.buffer.version ) {

this.buffer.version = this.instanceMesh.instanceMatrix.version;

}

if ( this.instanceMesh.instanceColor && this.instanceMesh.instanceColor.usage !== DynamicDrawUsage && this.instanceMesh.instanceColor.version !== this.bufferColor.version ) {
if ( this.instanceMesh.instanceColor && this.instanceMesh.instanceColor.usage !== DynamicDrawUsage && this.bufferColor != null && this.instanceMesh.instanceColor.version !== this.bufferColor.version ) {

this.bufferColor.version = this.instanceMesh.instanceColor.version;

Expand Down