Prepare WebRender for crates.io release

Changes made:

    - Update webrender and in-repo crates that are dependencies of
    webrender to version 0.68

    - Update these crates to use workspace depency versions similar to
      stylo#249 (seeing as the feedback on that change was positive).

I have not bothered updating the versions of the other in-repo crates
that are not dependencies of webrender (e.g. wrench and crates that are
used by wrench like swgl) as we don't need to publish those and thus
their version numbers don't matter, and I figured it would keep the diff
a little smaller. But it would be easy to update those too if we wanted
to.

Signed-off-by: Nico Burns <[email protected]>

Author: nicoburns

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
       - name: Install freetype
-        run: sudo apt install libfreetype-dev
+        run: sudo apt update && sudo apt install -y libfreetype-dev
       - name: Build wrench
         run: |
           cd wrench

Cargo.lock

@@ -8,7 +8,19 @@ members = [
 ]
 resolver = "2"
 
+[workspace.package]
+version = "0.68.0"
+
 [workspace.dependencies]
+api = { version = "0.68", path = "./webrender_api", package = "webrender_api" }
+glsl-to-cxx = { version = "0.68", path = "./glsl-to-cxx", package = "glsl-to-cxx" }
+glyph_rasterizer = { version = "0.68", path = "./wr_glyph_rasterizer", package = "wr_glyph_rasterizer" }
+malloc_size_of = { version = "0.2.2", path = "./wr_malloc_size_of", package = "wr_malloc_size_of" }
+peek-poke = { version = "0.3", path = "./peek-poke", package = "peek-poke" }
+swgl = { version = "0.68", path = "./swgl", package = "swgl" }
+webrender = { version = "0.68", path = "./webrender", package = "webrender" }
+webrender_build = { version = "0.68", path = "./webrender_build", package = "webrender_build" }
+
 gleam = "0.15.1"
 glean = "=65.2.1"
 

Cargo.toml

@@ -4,8 +4,8 @@
 
 WebRender is a GPU-based 2D rendering engine written in [Rust](https://www.rust-lang.org/). [Firefox](https://www.mozilla.org/firefox), the research web browser [Servo](https://github.com/servo/servo), and other GUI frameworks draw with it. It currently uses the OpenGL API internally.
 
-Note that the canonical home for this code is in gfx/wr folder of the
-mozilla-central repository at https://hg.mozilla.org/mozilla-central. The
+Note that the canonical home for this code is in [gfx/wr folder[(https://github.com/mozilla-firefox/firefox/tree/main/gfx/wr)] of the
+mozilla-central repository at https://github.com/mozilla-firefox/firefox. The
 Github repository at https://github.com/servo/webrender should be considered
 a downstream mirror, although it contains additional metadata (such as Github
 wiki pages) that do not exist in mozilla-central. Pull requests against the
@@ -51,3 +51,17 @@ example.
 
 See [this gist](https://gist.github.com/finalfantasia/129cae811e02bf4551ac) for
 how to make the text tests useful in Fedora, for example.
+
+# Publishing
+
+When publishing these crates to crates.io, the must be published in order.
+
+- `wr_malloc_size_of`: **DO NOT PUBLISH THIS CRATE**. It is released from the upstream repository.
+- `webrender_build`
+- `glsl-to-cxx`
+- `swgl`
+- `peek-poke-derive` (`peek-poke/peek-poke-derive`)
+- `peek-poke` (`peek-poke/peek-poke-derive`)
+- `webrender-api`
+- `wr_glyph_rasterizer`
+- `webrender`

README.md

@@ -1,6 +1,7 @@
 [package]
 name = "glsl-to-cxx"
-version = "0.1.0"
+version.workspace = true
+description = "A translator from GLSL to vectorized C++."
 license = "MPL-2.0"
 authors = ["The Mozilla Project Developers", "Dimitri Sabadie"]
 edition = "2018"

glsl-to-cxx/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "swgl"
-version = "0.1.0"
+version.workspace = true
 license = "MPL-2.0"
 authors = ["The Mozilla Project Developers"]
 build = "build.rs"
 description = "Software OpenGL implementation for WebRender."
 
 [build-dependencies]
 cc = "1.0.46"
-glsl-to-cxx = { path = "../glsl-to-cxx" }
-webrender_build = { path = "../webrender_build" }
+glsl-to-cxx = { workspace = true }
+webrender_build = { workspace = true }
 
 [dependencies]
 gleam = { workspace = true }

swgl/Cargo.toml

@@ -137,7 +137,7 @@ fn translate_shader(
 }
 
 fn main() {
-    let shader_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap() + "/../webrender/res";
+    let shader_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap() + "/res";
 
     let shader_flags = ShaderFeatureFlags::GL
         | ShaderFeatureFlags::DUAL_SOURCE_BLENDING

swgl/build.rs

@@ -0,0 +1,70 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if defined(GL_ES)
+    #if GL_ES == 1
+        // Sampler default precision is lowp on mobile GPUs.
+        // This causes RGBA32F texture data to be clamped to 16 bit floats on some GPUs (e.g. Mali-T880).
+        // Define highp precision macro to allow lossless FLOAT texture sampling.
+        #define HIGHP_SAMPLER_FLOAT highp
+
+        // Default int precision in GLES 3 is highp (32 bits) in vertex shaders
+        // and mediump (16 bits) in fragment shaders. If an int is being used as
+        // a texel address in a fragment shader it, and therefore requires > 16
+        // bits, it must be qualified with this.
+        #define HIGHP_FS_ADDRESS highp
+
+        // texelFetchOffset is buggy on some Android GPUs (see issue #1694).
+        // Fallback to texelFetch on mobile GPUs.
+        #define TEXEL_FETCH(sampler, position, lod, offset) texelFetch(sampler, position + offset, lod)
+    #else
+        #define HIGHP_SAMPLER_FLOAT
+        #define HIGHP_FS_ADDRESS
+        #define TEXEL_FETCH(sampler, position, lod, offset) texelFetchOffset(sampler, position, lod, offset)
+    #endif
+#else
+    #define HIGHP_SAMPLER_FLOAT
+    #define HIGHP_FS_ADDRESS
+    #if defined(PLATFORM_MACOS) && !defined(SWGL)
+        // texelFetchOffset introduces a variety of shader compilation bugs on macOS Intel so avoid it.
+        #define TEXEL_FETCH(sampler, position, lod, offset) texelFetch(sampler, position + offset, lod)
+    #else
+        #define TEXEL_FETCH(sampler, position, lod, offset) texelFetchOffset(sampler, position, lod, offset)
+    #endif
+#endif
+
+#ifdef SWGL
+    #define SWGL_DRAW_SPAN
+    #define SWGL_CLIP_MASK
+    #define SWGL_ANTIALIAS
+    #define SWGL_BLEND
+    #define SWGL_CLIP_DIST
+#endif
+
+#ifdef WR_VERTEX_SHADER
+    #ifdef SWGL
+        // Annotate a vertex attribute as being flat per each drawn primitive instance.
+        // SWGL can use this information to avoid redundantly loading the attribute in all SIMD lanes.
+        #define PER_INSTANCE flat
+    #else
+        #define PER_INSTANCE
+    #endif
+
+    #if __VERSION__ != 100
+        #define varying out
+        #define attribute in
+    #endif
+#endif
+
+#ifdef WR_FRAGMENT_SHADER
+    precision highp float;
+    #if __VERSION__ != 100
+        #define varying in
+    #endif
+#endif
+
+// Flat interpolation is not supported on ESSL 1
+#if __VERSION__ == 100
+    #define flat
+#endif