diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-09-10 14:38:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-10 12:38:56 +0000 |
commit | a9d37cb85ac2c55fc630fccffe1ba60ff00f555b (patch) | |
tree | e072f86743d0ee71f908135cb63484f84c8370f4 /third_party/webrender/wrench/script/headless.py | |
parent | c079acb3c31e695e9f16b96b9bd61b2a1c182796 (diff) | |
download | servo-a9d37cb85ac2c55fc630fccffe1ba60ff00f555b.tar.gz servo-a9d37cb85ac2c55fc630fccffe1ba60ff00f555b.zip |
Upgrade WebRender to e491e1ae637b2eed1e7195855d88357e5eb3ddf9 (#30323)
* Upgrade vendored version of WebRender
* Patch WebRender: upgrade version of gleam
* Restore hit testing implementation
* Fix WebRender warnings
* Adapt Servo to new WebRender
* Update results
* Add a workaround for #30313
This slightly expands text boundaries in order to take into account the
fact that layout isn't measuring glyph boundaries.
Diffstat (limited to 'third_party/webrender/wrench/script/headless.py')
-rwxr-xr-x | third_party/webrender/wrench/script/headless.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/third_party/webrender/wrench/script/headless.py b/third_party/webrender/wrench/script/headless.py index 0b98b138626..109fca1cb2e 100755 --- a/third_party/webrender/wrench/script/headless.py +++ b/third_party/webrender/wrench/script/headless.py @@ -96,18 +96,16 @@ 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(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") + osmesa_path = path.join(base, "out", "mesa", "src", "gallium", "targets", "osmesa") + glapi_path = path.join(base, "out", "mesa", "src", "mapi", "shared-glapi") os.environ["DYLD_LIBRARY_PATH"] = osmesa_path + ":" + glapi_path - os.environ["GALLIUM_DRIVER"] = "softpipe" extra_flags = os.getenv('CARGOFLAGS', None) @@ -149,6 +147,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', '-h'] + sys.argv[1:] +cmd = dbg_cmd + [target_folder + 'wrench', '--no-scissor', '--headless'] + sys.argv[1:] print('Running: `' + ' '.join(cmd) + '`') -subprocess.check_call(cmd) +subprocess.check_call(cmd, stderr=subprocess.STDOUT) |