Add WebGL impl and enable access to Outline, Contour and Scene #256

s3bk · 2020-01-31T21:20:20Z

This is a squashed commit of my cleaned up collected modifications.


        Add WebGL impl and enable access to Outline, Contour and Scene

s3bk · 2020-01-31T21:21:45Z

shaders/tile_alpha_vertex.inc.glsl

@@ -33,7 +33,7 @@ void computeVaryings() {
    vec2 origin = vec2(aTileOrigin.xy) + vec2(aTileOrigin.z & 15u, aTileOrigin.z >> 4u) * 256.0;
    vec2 position = (origin + vec2(aTessCoord)) * uTileSize;
    vec2 maskTexCoordOrigin = computeTileOffset(uint(aTileIndex), uStencilTextureSize.x);
-    vec2 maskTexCoord = maskTexCoordOrigin + aTessCoord * uTileSize;
+    vec2 maskTexCoord = maskTexCoordOrigin + vec2(aTessCoord) * uTileSize;


The implicit cast turned out to make WebGL very unhappy, so I made it explicit.

s3bk · 2020-01-31T21:24:09Z

gpu/src/resources.rs

+    }
+}
+
+pub struct EmbeddedResourceLoader;


This can probably use some tuning in the future to only include the files actually needed. But it works for now.

Won't this cause a rebuild when changing the shaders? One of the benefits of the FilesystemResourceLoader is live shader editing without rebuilding. I know it's not possible to use the filesystem in WebAssembly, but maybe we should make this enabled on the wasm target only for now.

I moved the EmbeddedResourceLoader into pathfinder_resources and added a bunch of feature flags to control what gets included.
The demo runs.

s3bk · 2020-01-31T21:25:12Z

renderer/src/builder.rs

@@ -53,6 +58,7 @@ impl<'a> SceneBuilder<'a> {
    }

    pub fn build<E>(&mut self, executor: &E) where E: Executor {
+        #[cfg(not(target_arch = "wasm32"))]
        let start_time = Instant::now();


caused a panic in wasm

s3bk · 2020-01-31T21:25:42Z

renderer/src/options.rs

@@ -17,6 +17,7 @@ use pathfinder_geometry::transform3d::Perspective;
 use pathfinder_geometry::vector::{Vector2F, Vector4F};
 use pathfinder_content::clip::PolygonClipper3D;

+// FIXME: Can this use &mut self ? (Sebastian Köln)


The idea is to make it a bit faster…

s3bk · 2020-01-31T21:28:04Z

canvas/src/lib.rs

+        self.flush_current_contour();
+        self.outline.transform(transform);
+        self
+    }


These functions are used by vector

pcwalton · 2020-01-31T21:32:36Z

Hmm. Maybe we should move the WebGL code into pathfinder_gl, so that we can avoid duplicating helper functions like flip_y? We can use #[cfg] directives to choose the right implementation.

s3bk · 2020-01-31T21:36:12Z

flip_y doesn't actually appear to be used

s3bk · 2020-01-31T21:42:45Z

hm. actually that broke something.

s3bk · 2020-01-31T22:05:52Z

So the EmbeddedResourceLoader is broken and I am not sure why. I didn't change anything from when it was working…
Apparently updating phf to 0.8 caused it.


        clean up

s3bk · 2020-01-31T22:15:52Z

working again.


        move EmbeddedResourceLoader into pathfinder_resources


        Rename some resources.

Put the DebugUiPresenter behind the debug_ui feature flag

s3bk · 2020-02-01T09:50:44Z

As a side effect of adding fine control over what gets embedded, my wasm is now less than half the size.


        update usvg and add Div to Vector2F


        add the missing lut textures back


        Merge https://github.com/servo/pathfinder into PR

Clean up unused imports


        Merge branch 'master' of https://github.com/servo/pathfinder into PR


        fix tile_solid shader


        really fix the shaders and the Makefile that builds them


        Merge branch 'master' of https://github.com/servo/pathfinder into PR


        fix stuff


        Merge branch 'master' of https://github.com/servo/pathfinder into PR


        update pathfinder_webgl


        set texture interpolation to nearest

s3bk · 2020-02-22T17:29:53Z

The latest commit is not actually WebGL specific. However it fixed glitches that appear to originate from the tile background texture lookup.

Dollab · 2020-02-25T11:20:17Z

This is really cool ! Would be awesome to merge this !


        Merge branch 'master' of https://github.com/servo/pathfinder into PR


        Merge branch 'master' of https://github.com/servo/pathfinder into PR


        fix webgl.

let travis build pathfinder_webgl


        fix tile_solid shader for WebGL2

pcwalton · 2020-02-28T18:21:05Z

Reviewing this now.

pcwalton · 2020-02-28T18:42:20Z

WebGL backend is merged: e2fbde8

pcwalton · 2020-02-28T20:50:22Z

Made the WebGL fixes, I believe: ee6c7e0

zimond · 2020-02-29T12:08:35Z

@pcwalton seems pathfinder_resources is not declared as a dep of pathfinder_webgl

Add WebGL impl and enable access to Outline, Contour and Scene

Loading status checks…

24b3a5c

s3bk reviewed Jan 31, 2020

View changes

canvas/src/lib.rs

self.flush_current_contour();

self.outline.transform(transform);

self

}

This comment has been minimized.

Sign in to view

s3bk Jan 31, 2020
Author Contributor

These functions are used by vector

s3bk force-pushed the s3bk:PR branch from 7552bf1 to 91a1b44 Jan 31, 2020

s3bk force-pushed the s3bk:PR branch from 91a1b44 to 4d0e36c Jan 31, 2020

clean up

Loading status checks…

79b6993

s3bk force-pushed the s3bk:PR branch from 4d0e36c to 79b6993 Jan 31, 2020

move EmbeddedResourceLoader into pathfinder_resources

Loading status checks…

7a5a437

s3bk force-pushed the s3bk:PR branch from 0c8782f to 7a5a437 Feb 1, 2020

Rename some resources.

Loading status checks…

09d940e

Put the DebugUiPresenter behind the debug_ui feature flag

s3bk force-pushed the s3bk:PR branch from d54c3d8 to 09d940e Feb 1, 2020

s3bk added 10 commits Feb 2, 2020

update usvg and add Div to Vector2F

2968209

add the missing lut textures back

Loading status checks…

9ff6921

Merge https://github.com/servo/pathfinder into PR

Loading status checks…

a16c6fd

Clean up unused imports

Merge branch 'master' of https://github.com/servo/pathfinder into PR

Loading status checks…

24a202f

fix tile_solid shader

Loading status checks…

57a542e

really fix the shaders and the Makefile that builds them

Loading status checks…

cbb958e

Merge branch 'master' of https://github.com/servo/pathfinder into PR

Loading status checks…

15f1459

fix stuff

Loading status checks…

e7782aa

Merge branch 'master' of https://github.com/servo/pathfinder into PR

cb59789

update pathfinder_webgl

a1702ed

set texture interpolation to nearest

Loading status checks…

0183e70

s3bk added 4 commits Feb 25, 2020

Merge branch 'master' of https://github.com/servo/pathfinder into PR

Loading status checks…

955dc64

Merge branch 'master' of https://github.com/servo/pathfinder into PR

Loading status checks…

77ed8f3

fix webgl.

Loading status checks…

3d32273

let travis build pathfinder_webgl

fix tile_solid shader for WebGL2

Loading status checks…

18d2007

s3bk closed this Feb 28, 2020

servo / pathfinder

Add WebGL impl and enable access to Outline, Contour and Scene #256

Add WebGL impl and enable access to Outline, Contour and Scene #256

s3bk commented Jan 31, 2020

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

pcwalton commented Jan 31, 2020

s3bk commented Jan 31, 2020

s3bk commented Jan 31, 2020

s3bk commented Jan 31, 2020 •

edited

s3bk commented Jan 31, 2020

s3bk commented Feb 1, 2020

s3bk commented Feb 22, 2020

Dollab commented Feb 25, 2020

pcwalton commented Feb 28, 2020

pcwalton commented Feb 28, 2020

pcwalton commented Feb 28, 2020

zimond commented Feb 29, 2020

servo / pathfinder

Join GitHub today

Add WebGL impl and enable access to Outline, Contour and Scene #256

Add WebGL impl and enable access to Outline, Contour and Scene #256

Conversation

s3bk commented Jan 31, 2020

This comment has been minimized.

s3bk Jan 31, 2020 • edited

This comment has been minimized.

s3bk Jan 31, 2020

This comment has been minimized.

pcwalton Jan 31, 2020 • edited

This comment has been minimized.

s3bk Feb 1, 2020

This comment has been minimized.

s3bk Jan 31, 2020

This comment has been minimized.

s3bk Jan 31, 2020

This comment has been minimized.

s3bk Jan 31, 2020

pcwalton commented Jan 31, 2020

s3bk commented Jan 31, 2020

s3bk commented Jan 31, 2020

s3bk commented Jan 31, 2020 • edited

s3bk commented Jan 31, 2020

s3bk commented Feb 1, 2020

s3bk commented Feb 22, 2020

Dollab commented Feb 25, 2020

pcwalton commented Feb 28, 2020

pcwalton commented Feb 28, 2020

pcwalton commented Feb 28, 2020

zimond commented Feb 29, 2020

s3bk Jan 31, 2020 •

edited

pcwalton Jan 31, 2020 •

edited

s3bk commented Jan 31, 2020 •

edited