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

This reverts commit a9d37cb85ac2c55fc630fccffe1ba60ff00f555b.

1 files changed, 9 insertions, 7 deletions

diff --git a/third_party/webrender/wrench/script/headless.py b/third_party/webrender/wrench/script/headless.py
index 109fca1cb2e..0b98b138626 100755
--- a/third_party/webrender/wrench/script/headless.py
+++ b/third_party/webrender/wrench/script/headless.py
@@ -96,16 +96,18 @@ def optimized_build():
 
 def set_osmesa_env(bin_path):
     """Set proper LD_LIBRARY_PATH and DRIVE for software rendering on Linux and OSX"""
-    base = find_dep_path_newest('osmesa-src', bin_path)
-    osmesa_path = path.join(base, "out", "mesa", "src", "gallium", "targets", "osmesa")
-    os.environ["GALLIUM_DRIVER"] = "llvmpipe"
     if is_linux():
+        osmesa_path = path.join(find_dep_path_newest('osmesa-src', bin_path), "out", "lib", "gallium")
         print(osmesa_path)
         os.environ["LD_LIBRARY_PATH"] = osmesa_path
+        os.environ["GALLIUM_DRIVER"] = "softpipe"
     elif is_macos():
-        osmesa_path = path.join(base, "out", "mesa", "src", "gallium", "targets", "osmesa")
-        glapi_path = path.join(base, "out", "mesa", "src", "mapi", "shared-glapi")
+        osmesa_path = path.join(find_dep_path_newest('osmesa-src', bin_path),
+                                "out", "src", "gallium", "targets", "osmesa", ".libs")
+        glapi_path = path.join(find_dep_path_newest('osmesa-src', bin_path),
+                               "out", "src", "mapi", "shared-glapi", ".libs")
         os.environ["DYLD_LIBRARY_PATH"] = osmesa_path + ":" + glapi_path
+        os.environ["GALLIUM_DRIVER"] = "softpipe"
 
 
 extra_flags = os.getenv('CARGOFLAGS', None)
@@ -147,6 +149,6 @@ set_osmesa_env(target_folder)
 #           cause 1.0 / 255.0 pixel differences in a subsequent test. For now, we
 #           run tests with no-scissor mode, which ensures a complete target clear
 #           between test runs. But we should investigate this further...
-cmd = dbg_cmd + [target_folder + 'wrench', '--no-scissor', '--headless'] + sys.argv[1:]
+cmd = dbg_cmd + [target_folder + 'wrench', '--no-scissor', '-h'] + sys.argv[1:]
 print('Running: `' + ' '.join(cmd) + '`')
-subprocess.check_call(cmd, stderr=subprocess.STDOUT)
+subprocess.check_call(cmd)