Auto merge of servo#4299 - moz-gfx:github-sync, r=auto

Sync changes from mozilla-central gfx/wr
NathanRoyer · Mar 12, 2021 · 0511c1e · 0511c1e
2 parents b7f3291 + 5671424
commit 0511c1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/swgl/src/composite.h b/swgl/src/composite.h
@@ -890,7 +890,7 @@ static void linear_row_yuv(uint32_t* dest, int span, sampler2DRect samplerY,
 
     // If we're sampling the UV planes at half the resolution of the Y plane,
     // then try to use half resolution fast-path.
-    if (yDU >= cDU && yDU <= (4 << (STEP_BITS + 7)) &&
+    if (yDU >= cDU && cDU > 0 && yDU <= (4 << (STEP_BITS + 7)) &&
         cDU <= (2 << (STEP_BITS + 7))) {
       // Ensure that samples don't fall outside of the valid bounds of each
       // planar texture. Step until the initial X coordinates are positive.

diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml
@@ -44,7 +44,7 @@ malloc_size_of_derive = "0.1"
 num-traits = "0.2"
 plane-split = "0.17"
 png = { optional = true, version = "0.16" }
-rayon = "1.5"
+rayon = "1"
 ron = { optional = true, version = "0.6.2" }
 serde = { optional = true, version = "1.0", features = ["serde_derive"] }
 serde_json = { optional = true, version = "1.0" }