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: Introducing an IndirectStorageBufferAttribute #1334

Merged
merged 5 commits into from
Nov 4, 2024
Merged

WebGPURenderer: Introducing an IndirectStorageBufferAttribute #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae2f628
WebGPURenderer: Introducing an IndirectStorageBufferAttribute
Methuselah96 Nov 4, 2024
4267758
Update three.js
Methuselah96 Nov 4, 2024
08a4553
Add src
Methuselah96 Nov 4, 2024
2d1c1a7
Update patch and delete src
Methuselah96 Nov 4, 2024
b3195de
Update declarations
Methuselah96 Nov 4, 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
41 changes: 21 additions & 20 deletions src-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3049,7 +3049,7 @@ index 0b00319a..c190633b 100644
}
}
diff --git a/src-testing/src/renderers/common/Attributes.ts b/src-testing/src/renderers/common/Attributes.ts
index ad7de840..8cca219d 100644
index 4631d528..a9edf948 100644
--- a/src-testing/src/renderers/common/Attributes.ts
+++ b/src-testing/src/renderers/common/Attributes.ts
@@ -2,15 +2,25 @@ import DataMap from './DataMap.js';
Expand Down Expand Up @@ -3090,7 +3090,7 @@ index ad7de840..8cca219d 100644
const data = this.get(attribute);

if (data.version === undefined) {
@@ -44,10 +54,11 @@ class Attributes extends DataMap {
@@ -46,10 +56,11 @@ class Attributes extends DataMap {
}
}

Expand Down Expand Up @@ -3342,7 +3342,7 @@ index a12f3563..e7ae8d1c 100644
}

diff --git a/src-testing/src/renderers/common/Bindings.ts b/src-testing/src/renderers/common/Bindings.ts
index 38dc9811..d6820e2f 100644
index fee94385..0c13e27c 100644
--- a/src-testing/src/renderers/common/Bindings.ts
+++ b/src-testing/src/renderers/common/Bindings.ts
@@ -1,8 +1,42 @@
Expand Down Expand Up @@ -3408,7 +3408,7 @@ index 38dc9811..d6820e2f 100644
const bindings = this.nodes.getForCompute(computeNode).bindings;

for (const bindGroup of bindings) {
@@ -53,33 +87,33 @@ class Bindings extends DataMap {
@@ -53,26 +87,26 @@ class Bindings extends DataMap {
return bindings;
}

Expand Down Expand Up @@ -3440,9 +3440,10 @@ index 38dc9811..d6820e2f 100644
+ this.textures.updateTexture((binding as SampledTexture).texture);
+ } else if ((binding as StorageBuffer).isStorageBuffer) {
+ const attribute = (binding as StorageBuffer).attribute;

this.attributes.update(attribute, AttributeType.STORAGE);
}
const attributeType = attribute.isIndirectStorageBufferAttribute
? AttributeType.INDIRECT
: AttributeType.STORAGE;
@@ -82,7 +116,7 @@ class Bindings extends DataMap {
}
}

Expand All @@ -3451,7 +3452,7 @@ index 38dc9811..d6820e2f 100644
const { backend } = this;

let needsBindingsUpdate = false;
@@ -87,27 +121,31 @@ class Bindings extends DataMap {
@@ -90,27 +124,31 @@ class Bindings extends DataMap {
// iterate over all bindings and check if buffer updates or a new binding group is required

for (const binding of bindGroup.bindings) {
Expand Down Expand Up @@ -3494,7 +3495,7 @@ index 38dc9811..d6820e2f 100644

if (updated) {
this.textures.updateTexture(texture);
@@ -123,10 +161,10 @@ class Bindings extends DataMap {
@@ -126,10 +164,10 @@ class Bindings extends DataMap {
// TODO: Remove this once we found why updated === false isn't bound to a texture in the WebGPU backend
console.error(
'Bindings._update: binding should be available:',
Expand All @@ -3507,7 +3508,7 @@ index 38dc9811..d6820e2f 100644
needsBindingsUpdate,
);

@@ -137,7 +175,7 @@ class Bindings extends DataMap {
@@ -140,7 +178,7 @@ class Bindings extends DataMap {
if (texture.isStorageTexture === true) {
const textureData = this.get(texture);

Expand Down Expand Up @@ -3792,13 +3793,13 @@ index 0fd3ca53..f6112ccf 100644

this.computeProgram = computeProgram;
diff --git a/src-testing/src/renderers/common/Constants.ts b/src-testing/src/renderers/common/Constants.ts
index 0d0c35a2..f5a186e1 100644
index c2dfad4c..02330947 100644
--- a/src-testing/src/renderers/common/Constants.ts
+++ b/src-testing/src/renderers/common/Constants.ts
@@ -2,7 +2,9 @@ export const AttributeType = {
VERTEX: 1,
@@ -3,7 +3,9 @@ export const AttributeType = {
INDEX: 2,
STORAGE: 4,
STORAGE: 3,
INDIRECT: 4,
-};
+} as const;
+
Expand Down Expand Up @@ -7723,7 +7724,7 @@ index b1e72064..40f26bf1 100644
const nodeData = this.getDataFromNode(node, shaderStage, this.globalCache);

diff --git a/src-testing/src/renderers/webgpu/WebGPUBackend.ts b/src-testing/src/renderers/webgpu/WebGPUBackend.ts
index c14a3647..3b2d32e7 100644
index 263ccfa4..840b556c 100644
--- a/src-testing/src/renderers/webgpu/WebGPUBackend.ts
+++ b/src-testing/src/renderers/webgpu/WebGPUBackend.ts
@@ -947,7 +947,7 @@ class WebGPUBackend extends Backend {
Expand All @@ -7736,7 +7737,7 @@ index c14a3647..3b2d32e7 100644
}

diff --git a/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts b/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts
index 9695019c..8d22fb34 100644
index 1adea208..53774495 100644
--- a/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts
+++ b/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts
@@ -10,7 +10,7 @@ import {
Expand Down Expand Up @@ -7892,7 +7893,7 @@ index 9695019c..8d22fb34 100644
const uniformNode = super.getUniformFromNode(node, type, shaderStage, name);
const nodeData = this.getDataFromNode(node, shaderStage, this.globalCache);

@@ -541,7 +565,7 @@ class WGSLNodeBuilder extends NodeBuilder {
@@ -542,7 +566,7 @@ class WGSLNodeBuilder extends NodeBuilder {
return 'vertexIndex';
}

Expand All @@ -7901,7 +7902,7 @@ index 9695019c..8d22fb34 100644
const layout = shaderNode.layout;
const flowData = this.flowShaderNode(shaderNode);

@@ -699,8 +723,8 @@ ${flowData.code}
@@ -700,8 +724,8 @@ ${flowData.code}
return snippets.join('\n');
}

Expand All @@ -7912,7 +7913,7 @@ index 9695019c..8d22fb34 100644

if (shaderStage === 'compute') {
this.getBuiltin('global_invocation_id', 'id', 'vec3<u32>', 'attribute');
@@ -786,8 +810,8 @@ ${flowData.code}
@@ -787,8 +811,8 @@ ${flowData.code}
return `\n${snippets.join('\n')}\n`;
}

Expand All @@ -7923,7 +7924,7 @@ index 9695019c..8d22fb34 100644

if (shaderStage === 'vertex') {
this.getBuiltin('position', 'Vertex', 'vec4<f32>', 'vertex');
@@ -823,7 +847,7 @@ ${flowData.code}
@@ -824,7 +848,7 @@ ${flowData.code}
return shaderStage === 'vertex' ? this._getWGSLStruct('VaryingsStruct', '\t' + code) : code;
}

Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 16 files
+3 −0 .eslintrc.json
+30 −0 docs/examples/en/controls/TransformControls.html
+10 −0 examples/jsm/controls/TransformControls.js
+0 −8 examples/jsm/tsl/display/GaussianBlurNode.js
+2 −4 examples/jsm/tsl/display/hashBlur.js
+ − examples/screenshots/webgpu_backdrop_area.jpg
+1 −1 examples/webgpu_backdrop_area.html
+1 −1 src/math/ColorManagement.js
+3 −3 src/nodes/accessors/StorageBufferNode.js
+0 −6 src/nodes/utils/ReflectorNode.js
+4 −0 src/renderers/common/Attributes.js
+2 −1 src/renderers/common/Bindings.js
+2 −1 src/renderers/common/Constants.js
+15 −0 src/renderers/common/IndirectStorageBufferAttribute.js
+6 −0 src/renderers/webgpu/WebGPUBackend.js
+5 −4 src/renderers/webgpu/nodes/WGSLNodeBuilder.js
3 changes: 2 additions & 1 deletion types/three/src/renderers/common/Constants.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
export declare const AttributeType: {
readonly VERTEX: 1;
readonly INDEX: 2;
readonly STORAGE: 4;
readonly STORAGE: 3;
readonly INDIRECT: 4;
};
export type AttributeType = (typeof AttributeType)[keyof typeof AttributeType];
export declare const GPU_CHUNK_BYTES = 16;
Expand Down
10 changes: 10 additions & 0 deletions types/three/src/renderers/common/IndirectStorageBufferAttribute.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { TypedArray } from "../../core/BufferAttribute.js";
import StorageBufferAttribute from "./StorageBufferAttribute.js";

declare class IndirectStorageBufferAttribute extends StorageBufferAttribute {
readonly isIndirectStorageBufferAttribute: true;

constructor(array: TypedArray, itemSize: number);
}

export default IndirectStorageBufferAttribute;
Loading