Skip to content

WebGPURenderer: extract common draw call logic from backends #1250

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
merged 5 commits into from
Sep 23, 2024
Merged

WebGPURenderer: extract common draw call logic from backends #1250

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
824bbf0
Update three.js
Methuselah96 Sep 23, 2024
c4c3a5d
Add src
Methuselah96 Sep 23, 2024
4fa316c
Update patch and delete src
Methuselah96 Sep 23, 2024
5369701
Update
Methuselah96 Sep 23, 2024
5562342
Update declarations
Methuselah96 Sep 23, 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
2 changes: 2 additions & 0 deletions examples-testing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const exceptionList = [
'webgpu_compute_points',
'webgpu_compute_texture',
'webgpu_compute_texture_pingpong',
'webgpu_compute_water',
'webgpu_cubemap_adjustments',
'webgpu_cubemap_dynamic',
'webgpu_cubemap_mix',
Expand Down Expand Up @@ -111,6 +112,7 @@ const exceptionList = [
'webgpu_tsl_procedural_terrain',
'webgpu_tsl_raging_sea',
'webgpu_tsl_transpiler',
'webgpu_tsl_vfx_linkedparticles',
'webgpu_tsl_vfx_tornado',
'webgpu_volume_cloud',
'webgpu_volume_perlin',
Expand Down
27 changes: 14 additions & 13 deletions src-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4597,7 +4597,7 @@ index 3fc3134e..c002ed0c 100644
}

diff --git a/src-testing/src/renderers/common/RenderObject.ts b/src-testing/src/renderers/common/RenderObject.ts
index 762a769a..a652f7ec 100644
index f4204ef4..70069d29 100644
--- a/src-testing/src/renderers/common/RenderObject.ts
+++ b/src-testing/src/renderers/common/RenderObject.ts
@@ -1,8 +1,24 @@
Expand Down Expand Up @@ -4626,7 +4626,7 @@ index 762a769a..a652f7ec 100644
const keys = Object.keys(obj);

let proto = Object.getPrototypeOf(obj);
@@ -27,7 +43,55 @@ function getKeys(obj) {
@@ -27,7 +43,56 @@ function getKeys(obj) {
}

export default class RenderObject {
Expand All @@ -4652,6 +4652,7 @@ index 762a769a..a652f7ec 100644
+ attributes: Array<BufferAttribute | InterleavedBufferAttribute> | null;
+ pipeline: RenderPipeline | null;
+ vertexBuffers: Array<BufferAttribute | InterleavedBuffer> | null;
+ drawParams: { vertexCount: number; firstVertex: number; instanceCount: number; firstInstance: number } | null;
+
+ clippingContext!: ClippingContext;
+
Expand Down Expand Up @@ -4683,16 +4684,16 @@ index 762a769a..a652f7ec 100644
this._nodes = nodes;
this._geometries = geometries;

@@ -50,7 +114,7 @@ export default class RenderObject {
this.pipeline = null;
@@ -51,7 +116,7 @@ export default class RenderObject {
this.vertexBuffers = null;
this.drawParams = null;

- this.updateClipping(renderContext.clippingContext);
+ this.updateClipping(renderContext.clippingContext!);

this.clippingContextVersion = this.clippingContext.version;

@@ -71,7 +135,7 @@ export default class RenderObject {
@@ -72,7 +137,7 @@ export default class RenderObject {
this.material.addEventListener('dispose', this.onMaterialDispose);
}

Expand All @@ -4701,7 +4702,7 @@ index 762a769a..a652f7ec 100644
const material = this.material;

let clippingContext = this.clippingContext;
@@ -89,9 +153,9 @@ export default class RenderObject {
@@ -90,9 +155,9 @@ export default class RenderObject {
}

get clippingNeedsUpdate() {
Expand All @@ -4713,7 +4714,7 @@ index 762a769a..a652f7ec 100644

return true;
}
@@ -109,7 +173,7 @@ export default class RenderObject {
@@ -110,7 +175,7 @@ export default class RenderObject {
}

getChainArray() {
Expand All @@ -4722,7 +4723,7 @@ index 762a769a..a652f7ec 100644
}

getAttributes() {
@@ -118,8 +182,8 @@ export default class RenderObject {
@@ -119,8 +184,8 @@ export default class RenderObject {
const nodeAttributes = this.getNodeBuilderState().nodeAttributes;
const geometry = this.geometry;

Expand All @@ -4733,7 +4734,7 @@ index 762a769a..a652f7ec 100644

for (const nodeAttribute of nodeAttributes) {
const attribute =
@@ -226,6 +290,6 @@ export default class RenderObject {
@@ -288,6 +353,6 @@ export default class RenderObject {
dispose() {
this.material.removeEventListener('dispose', this.onMaterialDispose);

Expand Down Expand Up @@ -7087,7 +7088,7 @@ index 3ebf6c48..b64e1942 100644
const nodeBuilder = renderObject.getNodeBuilderState();

diff --git a/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts b/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts
index a03c88ad..baf0ae06 100644
index 1b1e415b..6c9849b2 100644
--- a/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts
+++ b/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts
@@ -13,6 +13,7 @@ import { WebGLBufferRenderer } from './WebGLBufferRenderer.js';
Expand All @@ -7098,7 +7099,7 @@ index a03c88ad..baf0ae06 100644

//

@@ -672,7 +673,7 @@ class WebGLBackend extends Backend {
@@ -645,7 +646,7 @@ class WebGLBackend extends Backend {
this.textureUtils.destroyTexture(texture);
}

Expand Down Expand Up @@ -7504,10 +7505,10 @@ index 480df056..7509b1d7 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 2b0e1ea0..42869c3e 100644
index b5a0c604..2d3d1f1e 100644
--- a/src-testing/src/renderers/webgpu/WebGPUBackend.ts
+++ b/src-testing/src/renderers/webgpu/WebGPUBackend.ts
@@ -978,7 +978,7 @@ class WebGPUBackend extends Backend {
@@ -942,7 +942,7 @@ class WebGPUBackend extends Backend {
this.textureUtils.destroyTexture(texture);
}

Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 15 files
+1 −1 .github/workflows/ci.yml
+1 −1 .github/workflows/read-size.yml
+1 −1 .github/workflows/report-size.yml
+2 −0 examples/files.json
+ − examples/screenshots/webgpu_compute_water.jpg
+ − examples/screenshots/webgpu_tsl_vfx_linkedparticles.jpg
+505 −0 examples/webgpu_compute_water.html
+455 −0 examples/webgpu_tsl_vfx_linkedparticles.html
+468 −239 package-lock.json
+3 −3 src/nodes/lighting/AnalyticLightNode.js
+6 −0 src/renderers/WebGLRenderer.js
+56 −0 src/renderers/common/RenderObject.js
+10 −43 src/renderers/webgl-fallback/WebGLBackend.js
+9 −45 src/renderers/webgpu/WebGPUBackend.js
+2 −0 test/e2e/puppeteer.js
12 changes: 12 additions & 0 deletions types/three/src/renderers/common/RenderObject.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ export default class RenderObject {
attributes: Array<BufferAttribute | InterleavedBufferAttribute> | null;
pipeline: RenderPipeline | null;
vertexBuffers: Array<BufferAttribute | InterleavedBuffer> | null;
drawParams: {
vertexCount: number;
firstVertex: number;
instanceCount: number;
firstInstance: number;
} | null;
clippingContext: ClippingContext;
clippingContextVersion: number;
initialNodesCacheKey: string;
Expand Down Expand Up @@ -68,6 +74,12 @@ export default class RenderObject {
];
getAttributes(): (InterleavedBufferAttribute | BufferAttribute)[];
getVertexBuffers(): (InterleavedBuffer | BufferAttribute)[] | null;
getDrawParameters(): {
vertexCount: number;
firstVertex: number;
instanceCount: number;
firstInstance: number;
} | null;
getMaterialCacheKey(): string;
get needsUpdate(): boolean;
getDynamicCacheKey(): string;
Expand Down