Roll SwiftShader, ANGLE, use SwANGLE in test harnesses #33814

dnfield · 2022-06-03T21:06:08Z

Roll Swiftshader, ANGLE, and Vulkan deps.

Updates license bot for new locations of licenses and new files
in roll.

Converts unit test harnesses to use SwANGLE, which is the
supported way of using SwiftShader as a software backend for GLES.

Updates goldens due to swiftshader changes.

Fixes up include paths to avoid directly including third_party
code by that name, which is unlikely to work in other build
environments.

Includes upstream patches to ANGLE and SwiftShader to build in our
windows environments, as well as patches to Skia to support
defining the location of VulkanMemoryAllocator and a patch to ANGLE
to support opting into a newer version of VMA.

fixes flutter/flutter#90425

chinmaygarde · 2022-06-03T21:13:22Z

testing/run_tests.py

    RunEngineBenchmarks(build_dir, engine_filter)

  variants_to_skip = ['host_release', 'host_profile']
+<<<<<<< HEAD


chinmaygarde · 2022-06-03T21:15:40Z

testing/test_gl_surface.cc

 TestGLSurface::TestGLSurface(SkISize surface_size)
    : surface_size_(surface_size) {
-  display_ = ::eglGetDisplay(EGL_DEFAULT_DISPLAY);
+  PFNEGLGETPLATFORMDISPLAYEXTPROC egl_get_platform_display_EXT =


In GL and EGL, that the proc address is available doesn't mean that the extension is available as well. Please perform an extensions check for EGL_EXT_platform_base perhaps and also for any Angle specific extensions.

chinmaygarde · 2022-06-03T21:21:43Z

testing/test_gl_surface.cc

+  };
+
+  display_ = egl_get_platform_display_EXT(
+      EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<void*>(EGL_DEFAULT_DISPLAY),


Does this actually work? I would have expected this to be ::eglGetDisplay(EGL_DEFAULT_DISPLAY)

Yes. But maybe it's cheating? I can use the get display call

I have to do it this way because of https://bugs.chromium.org/p/angleproject/issues/detail?id=7435

Added a comment with a link to that bug.

Per the ANGLE folks this is actually expected behavior - the eglGetPlatformDisplayEXT call expects a native display pointer, which is not what is returned by eglGetDisplay.

dnfield · 2022-06-04T03:47:15Z

This needs:

dnfield · 2022-06-09T05:05:36Z

Most recent issues:

Linux tests appear to be failing due to eglInitialize failing on the SwANGLE display.
ANGLE depends on the Fuchsia GN SDK, and hard codes its location. We don't have that. I'm thinking we don't need this for Fuchsia though, so going to see if I can just exclude ANGLE on Fuchsia for now.

jason-simmons · 2022-06-10T00:37:51Z

I was able to run embedder_unittests on Linux with this patch by configuring ANGLE to use a headless display.

In flutter/tools/gn set:
gn_args['angle_vulkan_display_mode'] = 'headless'

dnfield · 2022-06-10T00:39:02Z

I was able to run embedder_unittests on Linux with this patch by configuring ANGLE to use a headless display.

In flutter/tools/gn set: gn_args['angle_vulkan_display_mode'] = 'headless'

So I had just tried the same and it's working, but something is still off with the way the test script runs from exe.unstrippes

dnfield · 2022-06-10T00:39:38Z

I think we probably also have to make that only happen for tests somehow. I can achieve the same with extensions in the test display setup, I think

jason-simmons · 2022-06-10T01:42:32Z

ANGLE and the Vulkan loader depend on directory paths and configuration files.

To run embedder_unittests from exe.unstripped:

symlink libvulkan.so.1 into exe.unstripped
in the environment, set VK_DRIVER_FILES=/path/to/engine/src/out/host_debug_unopt/vk_swiftshader_icd.json

libvulkan.so.1 must be in the same directory as the embedder_unittests executable because ANGLE is configured to build with ANGLE_USE_CUSTOM_LIBVULKAN. Alternatively ANGLE could be built with other settings that will search the system library paths.

dnfield · 2022-06-10T03:56:27Z

Yeah ANGLE is trying to load this from the module directory. I tried af ew different options to get it to load from the system but that didn't make things better. I finally went with just symlinking the files.

I'm making the test display config specifically request headless rather than configuring angle for headless - just in case we want to use this outside of headless test contexts at some point and don't want to be confused about it.

dnfield · 2022-06-21T19:41:35Z

Landed and updated the buildroot dep.

skia-gold · 2022-06-23T20:24:36Z

Gold has detected about 1 new digest(s) on patchset 49.
View them at https://flutter-engine-gold.skia.org/cl/github/33814

skia-gold · 2022-06-23T20:49:36Z

Gold has detected about 2 new digest(s) on patchset 50.
View them at https://flutter-engine-gold.skia.org/cl/github/33814

skia-gold · 2022-06-23T21:14:36Z

Gold has detected about 2 new digest(s) on patchset 51.
View them at https://flutter-engine-gold.skia.org/cl/github/33814

auto-submit · 2022-06-23T21:21:05Z

This commit is not mergeable and has conflicts. Please rebase your PR and fix all the conflicts.

auto-submit · 2022-06-23T21:25:05Z

This commit is not mergeable and has conflicts. Please rebase your PR and fix all the conflicts.

skia-gold · 2022-06-23T22:29:36Z

Gold has detected about 1 new digest(s) on patchset 55.
View them at https://flutter-engine-gold.skia.org/cl/github/33814

dnfield · 2022-06-23T22:52:58Z

I'm going to land this on red if the only failure is the currently failing Android test.

I'm doing this because bots keep overwriting the license hash on me and making it difficult to get this landed, and this patch can't be affecting android tests.

…er/engine#33814)

XilaiZhang · 2022-06-25T03:03:05Z

examples/vulkan_glfw/BUILD.gn

  deps = [
    "//flutter/shell/platform/embedder:embedder",
    "//third_party/glfw",
+    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",


seems like after this landed, my gn would complain

ERROR at //flutter/examples/vulkan_glfw/BUILD.gn:15:5: Can't load input file. "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",

I looked under third_party and couldn't find a folder vulkan-deps. Maybe I am missing anything, would be great if someone can instruct on how I can resolve this error? Thank you!

You need to gclient sync again.

that was faaaaaassssst, thanks a lot Dan!

dnfield added 2 commits June 3, 2022 14:03

swiftshader roll, swangle, update tests, still needs work

27cc18b

merge

39787b3

flutter-dashboard bot added the embedder Related to the embedder API label Jun 3, 2022

bump

03fa75a

chinmaygarde reviewed Jun 3, 2022

View reviewed changes

dnfield added 2 commits June 3, 2022 15:24

chinmay review

354fea5

missing dep, merge

ce20cfc

dnfield added 7 commits June 6, 2022 11:35

Merge remote-tracking branch 'upstream/main' into swiftshader

132cd07

buildroot

8c9b2fe

Merge remote-tracking branch 'upstream/main' into swiftshader

b5f06df

roll more

be33736

merge

83be0c2

merge

8f21944

fix merge

77525f0

dnfield added 3 commits June 8, 2022 22:09

no angle on fuchsia

381be30

Merge remote-tracking branch 'upstream/main' into swiftshader

9144216

update to real angle, try to debug linux failure more

7d32dd5

dnfield added 2 commits June 9, 2022 20:51

make Linux work

a0a0367

merge

0c7a449

dnfield added 3 commits June 9, 2022 22:35

license script

c8a8143

fix vulkan-headers dir

5027df7

no swiftshader on fuchsia

e560f24

dnfield changed the title ~~swiftshader roll, swangle, update tests, still needs work~~ Roll SwiftShader, ANGLE, use SwANGLE in test harnesses Jun 21, 2022

dnfield added 2 commits June 21, 2022 17:01

CI

36520b7

Merge branch 'swiftshader' of github.com:dnfield/engine into swiftshader

476eaaf

chinmaygarde approved these changes Jun 23, 2022

View reviewed changes

dnfield added 2 commits June 23, 2022 13:06

merge

3849d76

merge

3903f59

dnfield mentioned this pull request Jun 23, 2022

Adds a flag to the gn script to build with -fstack-protector #34257

Merged

license therapy

8b8aa74

more license

5d1f280

dnfield added autosubmit Merge PR when tree becomes green via auto submit App and removed needs tests labels Jun 23, 2022

fix cirrus again...

dc6f76e

licenes again

2622f5b

dnfield added 2 commits June 23, 2022 14:51

please?

031d266

come on

1db37fb

...;

88be58a

dnfield merged commit 08416ce into flutter:main Jun 23, 2022

dnfield deleted the swiftshader branch June 23, 2022 23:43

engine-flutter-autoroll mentioned this pull request Jun 24, 2022

Roll Flutter Engine from fc08bf45b0a8 to ea756c55f29a (39 revisions) flutter/flutter#106574

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 24, 2022

08416ce Roll SwiftShader, ANGLE, use SwANGLE in test harnesses (flutt…

5b4b018

…er/engine#33814)

XilaiZhang reviewed Jun 25, 2022

View reviewed changes

gaaclarke mentioned this pull request Jul 27, 2022

GN error when building macos engine flutter/flutter#108485

Closed

Roll SwiftShader, ANGLE, use SwANGLE in test harnesses #33814

Roll SwiftShader, ANGLE, use SwANGLE in test harnesses #33814

Uh oh!

Conversation

dnfield commented Jun 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dnfield commented Jun 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dnfield commented Jun 9, 2022

Uh oh!

jason-simmons commented Jun 10, 2022

Uh oh!

dnfield commented Jun 10, 2022

Uh oh!

dnfield commented Jun 10, 2022

Uh oh!

jason-simmons commented Jun 10, 2022

Uh oh!

dnfield commented Jun 10, 2022

Uh oh!

dnfield commented Jun 21, 2022

Uh oh!

skia-gold commented Jun 23, 2022

Uh oh!

skia-gold commented Jun 23, 2022

Uh oh!

skia-gold commented Jun 23, 2022

Uh oh!

auto-submit bot commented Jun 23, 2022

Uh oh!

auto-submit bot commented Jun 23, 2022

Uh oh!

skia-gold commented Jun 23, 2022

Uh oh!

dnfield commented Jun 23, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dnfield commented Jun 3, 2022 •

edited

Loading

dnfield commented Jun 4, 2022 •

edited

Loading