Revert "Upgrade WebRender to e491e1ae637b2eed1e7195855d88357e5eb3ddf9 (#30323)"revert-webrender

This reverts commit a9d37cb85ac2c55fc630fccffe1ba60ff00f555b.

8 files changed, 11 insertions, 72 deletions

diff --git a/third_party/webrender/ci-scripts/docker-image/setup.sh b/third_party/webrender/ci-scripts/docker-image/setup.sh
index 11adb1c269b..4a20147f3b0 100755
--- a/third_party/webrender/ci-scripts/docker-image/setup.sh
+++ b/third_party/webrender/ci-scripts/docker-image/setup.sh
@@ -14,19 +14,15 @@ test "$(whoami)" == 'root'
 # Install stuff we need
 apt-get -y update
 apt-get install -y \
-    bison \
     bzip2 \
     cmake \
     curl \
-    flex \
     gcc \
     git \
     g++ \
     libfontconfig1-dev \
     libgl1-mesa-dev \
     libx11-dev \
-    llvm-dev \
-    ninja-build \
     openjdk-8-jdk \
     pkg-config \
     python \
@@ -35,10 +31,7 @@ apt-get install -y \
     python-setuptools \
     python-voluptuous \
     python-yaml \
-    python3-pip \
-    python3-mako \
-    software-properties-common \
-    clang
+    software-properties-common
 
 # Other stuff we need
 pip install servo-tidy==0.3.0
diff --git a/third_party/webrender/ci-scripts/etc/wr-darwin.meson b/third_party/webrender/ci-scripts/etc/wr-darwin.meson
deleted file mode 100644
index 54499822254..00000000000
--- a/third_party/webrender/ci-scripts/etc/wr-darwin.meson
+++ /dev/null
@@ -1,18 +0,0 @@
-[binaries]
-llvm-config = '/builds/worker/fetches/clang/bin/llvm-config'
-
-[properties]
-# When linking `libOSMesa.dylib` Meson uses options provided by `llvm-config`.
-# The binary for `llvm-config` in Firefox CI comes from a native Linux clang,
-# which gives the link options for the Linux libLLVM-11.so in the Linux clang.
-# However, we want to link against a native macOS clang's libLLVM.dylib, which
-# we have available in a separate directory.
-# Meson will still have -lLLVM-11 on the command line, but the linker will
-# only warn that it has the wrong format (because it's not for macOS).
-cpp_link_args = ['-L/builds/worker/fetches/clang-mac/clang/lib', '-lLLVM']
-
-[host_machine]
-system = 'darwin'
-cpu_family = 'x86_64'
-cpu = 'i686'
-endian = 'little'
diff --git a/third_party/webrender/ci-scripts/install-meson.sh b/third_party/webrender/ci-scripts/install-meson.sh
deleted file mode 100755
index a0171d3a8e4..00000000000
--- a/third_party/webrender/ci-scripts/install-meson.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# 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/. */
-
-# This file downloads and installs meson which is required for building
-# osmesa-src, a dependency of wrench.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-set -o xtrace
-
-MESON_VER=0.55.1
-MESON_BASE_URL="https://github.com/mesonbuild/meson/releases/download"
-
-curl -L ${MESON_BASE_URL}/${MESON_VER}/meson-${MESON_VER}.tar.gz -o meson.tar.gz
-tar -xf meson.tar.gz
-mv meson-${MESON_VER} meson
-cd meson
-ln -s meson.py meson
diff --git a/third_party/webrender/ci-scripts/linux-debug-tests.sh b/third_party/webrender/ci-scripts/linux-debug-tests.sh
index d402d728f9e..2c2fc756b63 100755
--- a/third_party/webrender/ci-scripts/linux-debug-tests.sh
+++ b/third_party/webrender/ci-scripts/linux-debug-tests.sh
@@ -32,5 +32,5 @@ cargo build ${CARGOFLAGS}
 popd
 
 cargo test ${CARGOFLAGS} \
-    --all --exclude compositor --exclude compositor-wayland \
-    --exclude compositor-windows --exclude glsl-to-cxx --exclude swgl
+    --all --exclude compositor-windows --exclude compositor \
+    --exclude glsl-to-cxx --exclude swgl
diff --git a/third_party/webrender/ci-scripts/linux-release-tests.sh b/third_party/webrender/ci-scripts/linux-release-tests.sh
index 665fc88b5fe..f89fc43c44f 100755
--- a/third_party/webrender/ci-scripts/linux-release-tests.sh
+++ b/third_party/webrender/ci-scripts/linux-release-tests.sh
@@ -16,13 +16,7 @@ set -o xtrace
 CARGOFLAGS=${CARGOFLAGS:-""}  # default to empty if not set
 
 pushd wrench
-# Test that all shaders compile successfully.
-python script/headless.py --precache test_init
-python script/headless.py --precache --use-unoptimized-shaders test_init
-
 python script/headless.py reftest
 python script/headless.py rawtest
-python script/headless.py test_invalidation
-CXX=clang++ cargo run ${CARGOFLAGS} --release --features=software -- \
-  --software --headless reftest
+cargo build ${CARGOFLAGS} --release
 popd
diff --git a/third_party/webrender/ci-scripts/macos-debug-tests.sh b/third_party/webrender/ci-scripts/macos-debug-tests.sh
index 6dbf1f12311..2325475d90d 100755
--- a/third_party/webrender/ci-scripts/macos-debug-tests.sh
+++ b/third_party/webrender/ci-scripts/macos-debug-tests.sh
@@ -38,5 +38,5 @@ cargo check ${CARGOFLAGS}
 popd
 
 cargo test ${CARGOFLAGS} ${CARGOTESTFLAGS} \
-    --all --exclude compositor --exclude compositor-wayland \
-    --exclude compositor-windows --exclude glsl-to-cxx --exclude swgl
+    --all --exclude compositor-windows --exclude compositor \
+    --exclude glsl-to-cxx --exclude swgl
diff --git a/third_party/webrender/ci-scripts/macos-release-tests.sh b/third_party/webrender/ci-scripts/macos-release-tests.sh
index 5eb22c9f889..dc8c205ad53 100755
--- a/third_party/webrender/ci-scripts/macos-release-tests.sh
+++ b/third_party/webrender/ci-scripts/macos-release-tests.sh
@@ -19,13 +19,7 @@ CARGOFLAGS=${CARGOFLAGS:-""}  # default to empty if not set
 WRENCH_BINARY=${WRENCH_BINARY:-""}
 
 pushd wrench
-
-# Test that all shaders compile successfully.
-python script/headless.py --precache test_init
-python script/headless.py --precache --use-unoptimized-shaders test_init
-
 python script/headless.py reftest
-python script/headless.py test_invalidation
 if [[ -z "${WRENCH_BINARY}" ]]; then
     cargo build ${CARGOFLAGS} --release
     WRENCH_BINARY="../target/release/wrench"
diff --git a/third_party/webrender/ci-scripts/windows-tests.cmd b/third_party/webrender/ci-scripts/windows-tests.cmd
index cf3997b11b7..c3607a90287 100755
--- a/third_party/webrender/ci-scripts/windows-tests.cmd
+++ b/third_party/webrender/ci-scripts/windows-tests.cmd
@@ -21,13 +21,6 @@ popd
 pushd wrench
 cargo test --verbose
 if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
-:: Test that all shaders compile successfully. --precache compiles all shaders
-:: during initialization, therefore if init is successful then the shaders compile.
-cargo run --release -- --angle --precache test_init
-if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
-cargo run --release -- --angle --precache --use-unoptimized-shaders test_init
-if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
-
 cargo run --release -- --angle reftest
 if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 popd
@@ -36,3 +29,8 @@ pushd examples
 cargo check --verbose
 if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 popd
+
+pushd direct-composition
+cargo check --verbose
+if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+popd