Skip to content

Ported the stroke shader to WebGPU renderer #7915

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
davepagurek merged 20 commits into from
Jun 16, 2025
Merged

Ported the stroke shader to WebGPU renderer #7915

Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
77a9733
added stroke shader, currently not working
lukeplowden Jun 14, 2025
5db2d33
changed drawbuffers to draw stroke and fill buffers depending on curr…
lukeplowden Jun 16, 2025
a116e6f
fixed uViewport uniform (uniform problem fixed in upstream)
lukeplowden Jun 16, 2025
ddfeb05
remove console log
lukeplowden Jun 16, 2025
14f1857
remove unused variable
lukeplowden Jun 16, 2025
2c19cdc
remove hardcoded viewport (uniform issue fixed upstream)
lukeplowden Jun 16, 2025
e7696f0
fix stroke shader bugs from porting process)
lukeplowden Jun 16, 2025
ed88f91
stroke test
lukeplowden Jun 16, 2025
186f423
Merge remote-tracking branch 'upstream/webgpu' into webgpu
lukeplowden Jun 16, 2025
1e9b308
Merge remote-tracking branch 'upstream/webgpu' into webgpu
lukeplowden Jun 16, 2025
4dc493d
add stroke to preview
lukeplowden Jun 16, 2025
d88fba9
change stroke shader constants/ preprocessor to be compatible with we…
lukeplowden Jun 16, 2025
c48977a
rename fillHooks to populateHooks (ambiguous with fill/stroke)
lukeplowden Jun 16, 2025
f0875d7
add strokes back to WebGL mode
lukeplowden Jun 16, 2025
e8bedfc
add strokes back to WebGL mode
lukeplowden Jun 16, 2025
0b50257
missing }
lukeplowden Jun 16, 2025
0af8df9
typo in string
lukeplowden Jun 16, 2025
f120ad9
typo in string
lukeplowden Jun 16, 2025
1474c97
Merge branch 'webgpu' of github.com:lukeplowden/p5.js into webgpu
lukeplowden Jun 16, 2025
468b638
multiply alpha after hook
lukeplowden Jun 16, 2025
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
7 changes: 7 additions & 0 deletions src/webgl/p5.RendererGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,11 @@ class RendererGL extends Renderer3D {

if (!glBuffers) return;

<<<<<<< HEAD
if (this._curShader.shaderType === 'stroke') {
=======
if (this._curShader.shaderType === 'stroke'){
>>>>>>> f0875d795be9297bcdf9b312dffcafeda4741536
if (count === 1) {
gl.drawArrays(gl.TRIANGLES, 0, geometry.lineVertices.length / 3);
} else {
Expand All @@ -292,7 +296,10 @@ class RendererGL extends Renderer3D {
"🌸 p5.js says: Instancing is only supported in WebGL2 mode"
);
}
Copy link
Contributor

@davepagurek davepagurek Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be missing a } here

<<<<<<< HEAD
}
=======
>>>>>>> f0875d795be9297bcdf9b312dffcafeda4741536
} else if (glBuffers.indexBuffer) {
this._bindBuffer(glBuffers.indexBuffer, gl.ELEMENT_ARRAY_BUFFER);

Expand Down
Loading