feat: line layer and project module port to WGSL, test app for WebGPU line #9509

ibgreen · 2025-03-09T13:52:09Z

Closes #

Background

These changes should not affect WebGL/GLSL
project module port to WGSL
Line layer port to WGSL
test app for WebGPU line

Change List

coveralls · 2025-03-09T14:12:29Z

coverage: 91.629% (+0.1%) from 91.529%
when pulling 7df19ac on webgpu-only-changes
into 0712d93 on master.

felixpalmer

Very cool - nice to see how the majority of the changes can be made outside the existing code.

I tried running the example apps but got errors unfortunately. Is this the correct approach?

cd deck.gl
rm -rf node_modules
yarn bootstrap
cd test/apps/webgpu-scatterplot
yarn
yarn start-local

felixpalmer · 2025-03-11T15:32:55Z

examples/vite.config.local.mjs

      port: 8080
    },
    optimizeDeps: {
-      esbuildOptions: {target: 'es2020'}


Is this needed for this PR? Seems like a potentially risky unrelated change if not

At the moment deck.gl async loading (props.data = url) doesn't work, I have to load the data first and doing it using global await is most convenient.

Not making this change would require more work in the PR. I think we could land and revert it if problematic, the revert would only break the webgpu test apps.

felixpalmer · 2025-03-11T15:38:51Z

modules/core/src/shaderlib/project/project.wgsl.ts

+// -----------------------------------------------------------------------------
+
+// Returns an adjustment factor for commonUnitsPerMeter
+fn _project_size_at_latitude(lat: f32) -> f32 {


Why use _underscores in the function names?

The intention is to clearly mark that these are internal helper functions and not part of the public API of the shader module.

Since the module is injected in full source form into the shader, all of these functions are available to the layer shader.

felixpalmer · 2025-03-11T15:42:47Z

modules/core/src/shaderlib/project/project.wgsl.ts

+  transform: mat3x3<f32>,
+};
+
+fn project_needs_rotation(commonPosition: vec3<f32>) -> RotationResult {


Perhaps cleaner to just return a boolean and then call project_get_orientation_matrix() when needed to avoid the struct and identity matrix creation?

Perhaps cleaner to just return a boolean and then call project_get_orientation_matrix() when needed to avoid the struct and identity matrix creation?

Good idea. I think we need to audit this entire API, there are a bunch of new function names to handle the overloads and they most likely can be named better.

I think that audit can be a separate PR as we port a few more layers and get a good sense for what the best API will look like.

felixpalmer · 2025-03-11T15:44:11Z

modules/core/src/shaderlib/project/project.wgsl.ts

+fn project_position_vec4_f64(position: vec4<f32>, position64Low: vec3<f32>) -> vec4<f32> {
+  var position_world = project.modelMatrix * position;
+
+  // Work around for a Mac+NVIDIA bug:


Interesting question is whether we keep these workarounds? There is a good chance they are no longer needed given that the code paths taken by the drivers will likely be very different

Interesting question is whether we keep these workarounds? There is a good chance they are no longer needed given that the code paths taken by the drivers will likely be very different

Yes good point. Again, I would prefer to remove those in iterative follow up PRs rather than further raise the bar on this "enabler PR"

felixpalmer · 2025-03-11T15:48:42Z

modules/layers/src/line-layer/line-layer.wgsl.ts

+// Copyright (c) vis.gl contributors
+
+export const shaderWGSL = /* wgsl */ `\
+// TODO(ibgreen): Hack for Layer uniforms (move to new "color" module?)


Can you not add WGSL to https://github.com/visgl/deck.gl/blob/master/modules/core/src/shaderlib/misc/layer-uniforms.ts?

Yes, but I didn't implement the layer module at this stage. One needs to stop descending into the rabbithole at some point.

felixpalmer · 2025-03-11T15:51:12Z

modules/layers/src/scatterplot-layer/scatterplot-layer-uniforms.ts

-  fs: uniformBlock,
+  vs: glslUniformBlock,
+  fs: glslUniformBlock,
+  source: '',


Why not declare here like you did with the line-layer?

felixpalmer · 2025-03-11T15:54:36Z

modules/layers/src/scatterplot-layer/scatterplot-layer.wgsl.ts

+  lineWidthUnits: i32,
+};
+
+struct ConstantAttributeUniforms {


Not sure what this is doing? Is this some experiment to pass constant values in place of attributes?

Not sure what this is doing? Is this some experiment to pass constant values in place of attributes?

Correct, this is my best idea for how we would handle constant attributes.

felixpalmer · 2025-03-11T16:04:34Z

test/apps/webgpu-line/app.tsx

@@ -0,0 +1,132 @@
+// deck.gl


If these test apps are identical to the existing WebGL ones I think it's better to just add an option to the existing apps to run using webgpu (e.g. check for #webgpu in the URL, or add a toggle switch)

If these test apps are identical to the existing WebGL ones I think it's better to just add an option to the existing apps to run using webgpu (e.g. check for #webgpu in the URL, or add a toggle switch)

Yes, it will be very desirable to get to that point. But right now we would at least need to fix the async data loading bug in WebGPU and possible more issues. Again suitable for a fast follow in my opinion.

ibgreen · 2025-03-12T01:28:18Z

This PR only contains partial changes intended to be easy to review, approve and land. The full PR is #9432

ibgreen

Great observations, really good review.

My assumption was that as long as we don't break or degrade the WebGL code, we can land something imperfect for WebGPU and iterate on it in follow-ups.

ibgreen · 2025-03-14T12:14:36Z

@felixpalmer added a note to the WebGPU tracker that we should address your findings here.

… line (#9509)

lukasmasuch · 2025-03-19T14:47:43Z

@ibgreen @felixpalmer We tried to update to deck-gl 9.1.6 today in streamlit/streamlit#10844, but it seems to have broken our tests with this error that seems to be related to this PR:

⎯⎯⎯⎯⎯⎯ Failed Suites 2 ⎯⎯⎯⎯⎯⎯⎯

 FAIL  src/components/elements/DeckGlJsonChart/DeckGlJsonChart.test.tsx [ src/components/elements/DeckGlJsonChart/DeckGlJsonChart.test.tsx ]
 FAIL  src/components/elements/DeckGlJsonChart/utils/colors.test.ts [ src/components/elements/DeckGlJsonChart/utils/colors.test.ts ]
Error: Cannot find module '/home/runner/work/streamlit/streamlit/frontend/node_modules/@deck.gl/layers/dist/line-layer/line-layer.wgsl' imported from /home/runner/work/streamlit/streamlit/frontend/node_modules/@deck.gl/layers/dist/line-layer/line-layer.js
⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
Serialized Error: { code: 'ERR_MODULE_NOT_FOUND', url: 'file:///home/runner/work/streamlit/streamlit/frontend/node_modules/@deck.gl/layers/dist/line-layer/line-layer.wgsl' }
⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/2]⎯

However, I haven't looked more into it yet. Maybe the issue is on our side.

felixpalmer · 2025-03-20T14:26:34Z

@ibgreen could it be the file extension that is breaking some bundlers?

ibgreen · 2025-03-20T17:13:13Z

@ibgreen could it be the file extension that is breaking some bundlers?

Fine to change it but probably not, as far as I can tell we are already using similar .glsl.ts extension for glsl files.

We could always change to -wgsl instead of .wgsl to be sure.

felixpalmer · 2025-03-21T11:10:03Z

@lukasmasuch should be fixed in 9.1.7

lukasmasuch · 2025-03-21T14:07:15Z

@felixpalmer Thanks! 9.1.7 resolved the issue.

ibgreen added 3 commits March 9, 2025 09:49

feat: Test apps for WebGPU scatterplot and line

db9f578

prettier

9b09000

fix

afd53c7

ibgreen marked this pull request as ready for review March 9, 2025 14:54

ibgreen requested review from felixpalmer and Pessimistress March 9, 2025 14:54

felixpalmer requested changes Mar 11, 2025

View reviewed changes

ibgreen commented Mar 13, 2025

View reviewed changes

Merge branch 'master' into webgpu-only-changes

7df19ac

felixpalmer approved these changes Mar 14, 2025

View reviewed changes

ibgreen mentioned this pull request Mar 7, 2025

Tracker: WebGPU #9504

Open

30 tasks

ibgreen merged commit 988f26c into master Mar 14, 2025
4 checks passed

felixpalmer pushed a commit that referenced this pull request Mar 19, 2025

feat: line layer and project module port to WGSL, test app for WebGPU…

dbaf9aa

… line (#9509)

lukasmasuch mentioned this pull request Mar 19, 2025

Bump the deck-gl group in /frontend with 9 updates streamlit/streamlit#10844

Merged

felixpalmer mentioned this pull request Mar 21, 2025

fix(core) Append .js to WebGPU shaders for script builds #9537

Merged

ibgreen deleted the webgpu-only-changes branch April 11, 2025 18:05

feat: line layer and project module port to WGSL, test app for WebGPU line #9509

feat: line layer and project module port to WGSL, test app for WebGPU line #9509

Uh oh!

Conversation

ibgreen commented Mar 9, 2025

Background

Change List

Uh oh!

coveralls commented Mar 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

felixpalmer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ibgreen commented Mar 12, 2025

Uh oh!

ibgreen left a comment

Choose a reason for hiding this comment

Uh oh!

ibgreen commented Mar 14, 2025

Uh oh!

Uh oh!

lukasmasuch commented Mar 19, 2025

Uh oh!

felixpalmer commented Mar 20, 2025

Uh oh!

ibgreen commented Mar 20, 2025

Uh oh!

felixpalmer commented Mar 21, 2025

Uh oh!

lukasmasuch commented Mar 21, 2025

Uh oh!

Uh oh!

coveralls commented Mar 9, 2025 •

edited

Loading