-
Notifications
You must be signed in to change notification settings - Fork 6k
Make SKSL caching test work on Fuchsia on arm64 #18572
Conversation
@@ -124,6 +129,8 @@ TEST_F(ShellTest, CacheSkSLWorks) { | |||
}; | |||
fml::VisitFiles(dir.fd(), remove_visitor); | |||
DestroyShell(std::move(shell)); | |||
|
|||
#endif // defined(SHELL_ENABLE_GL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The #endif
should be at least before // Remove all files generated
. Otherwise, there might be some warnings about temp files not removed during the test.
BTW, would the test pass we if only put #ifdef
around the single line of ASSERT_EQ(skp_count, old_skp_count);
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I think it probably will, I'll check today
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the delay, got distracted. I wasn't able to wrap that one line because of an unused variable warning on old_skp_count, butI tightened up this ifdef as much as I could without otherwise refactoring the test.
That commit can merge as part of this PR. I didn't want to hook up the cache strategy configuration until we were ready to turn the actual test on. |
619c81b
to
fd738ab
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a little white space typo in your BUILD.gn file that's caught by our format test. Otherwise LGTM!
fd738ab
to
e455d4e
Compare
vulkan backend GrContext::precompileShader() is not implemented for vulkan contexts, so dont run the portion of this test that depends on that behavior on Vulkan.
e455d4e
to
fe6061f
Compare
* 141ee78 Roll Dart SDK from 2b917f5b6a0e to 0fab083e1c2b (15 revisions) (flutter/engine#18974) * f5ab179 Call Shell::NotifyLowMemoryWarning on Android Trim and LowMemory events (flutter/engine#18979) * 4dabac9 Roll Fuchsia Linux SDK from 8AiUM... to ThzHh... (flutter/engine#18976) * 50cae02 Reland: Add RAII wrapper for EGLSurface (flutter/engine#18977) * db7f226 Include the memory header as unique_ptr is used in ASCII Trie. (flutter/engine#18978) * b19a17d Implement an EGL resource context for the Linux shell. (flutter/engine#18918) * ca26b75 Make Linux shell plugin constructor descriptions consistent (flutter/engine#18940) * efd1452 Roll Skia from 9c401e7e1ace to f69e40841eb9 (11 revisions) (flutter/engine#18983) * e5845af Put JNI functions under an interface (flutter/engine#18903) * 1ddc6e1 Call destructor and fix check (flutter/engine#18985) * 7f71f1d Roll Fuchsia Mac SDK from oWhyp... to gAD3P... (flutter/engine#18982) * 74291b7 Roll Dart SDK from 0fab083e1c2b to e62b89c56d01 (10 revisions) (flutter/engine#18987) * 2739bbf [web] Provide a hook to disable location strategy (flutter/engine#18969) * 336d000 Roll Skia from f69e40841eb9 to 553496b66f12 (2 revisions) (flutter/engine#18992) * b82769b Roll Skia from 553496b66f12 to 0ad37b87549b (2 revisions) (flutter/engine#18993) * f5ca58b Roll Dart SDK from e62b89c56d01 to b0d2b97d2cd7 (4 revisions) (flutter/engine#18994) * 2a82a08 [dart] Account for compiler api change (flutter/engine#19002) * 369e0a9 Add ui_benchmarks (flutter/engine#18945) * a0a92d6 Roll Skia from 0ad37b87549b to de175abede4d (1 revision) (flutter/engine#18995) * cea5a9c Roll Dart SDK from b0d2b97d2cd7 to f043f9e5f6ea (6 revisions) (flutter/engine#18997) * d417772 Roll Fuchsia Mac SDK from gAD3P... to Wj0yo... (flutter/engine#19001) * 4538622 Roll Skia from de175abede4d to 32d5cfa1f35e (15 revisions) (flutter/engine#19005) * 71fce02 Fix shift-tab not working by adding more GTK->GLFW key mappings. (flutter/engine#18988) * 5ddc122 Fix inverted check in creating resource surface (flutter/engine#18989) * 87d8888 Show warning if method response errors occur and error not handled. (flutter/engine#18946) * 5171fbd Roll Skia from 32d5cfa1f35e to 21bbfc6c2dfe (5 revisions) (flutter/engine#19006) * 4bd6aea Always send key events, even if they're used for text input. (flutter/engine#18991) * 9f898e9 Don't process key events when the text input is not requested (flutter/engine#18990) * 48d7091 Roll buildroot for Windows warning update (flutter/engine#19000) * 5f37029 Roll Dart SDK from f043f9e5f6ea to f0ea02bc51f8 (22 revisions) (flutter/engine#19010) * ac809b4 onBeginFrame JNI (flutter/engine#18866) * e1c622b Make SKSL caching test work on Fuchsia on arm64 (flutter/engine#18572) * 2651beb Exit before pushing a trace event when layer tree holder is empty (flutter/engine#19008) * acf048b Remove log added for local testing (flutter/engine#19012) * 1f3aa23 Roll Dart SDK from f0ea02bc51f8 to 0b64f5488965 (9 revisions) (flutter/engine#19013) * 8dcc95d Roll Fuchsia Mac SDK from Wj0yo... to gR0Zc... (flutter/engine#19015) * f6455fa Roll Dart SDK from 0b64f5488965 to 50836c171e91 (4 revisions) (flutter/engine#19017) * b2fea9d Roll Skia from 21bbfc6c2dfe to 30212b7941d6 (6 revisions) (flutter/engine#19009) * 0065646 Roll Skia from 30212b7941d6 to 3d6bf04366f6 (17 revisions) (flutter/engine#19020) * 0a852d8 Revert "Call Shell::NotifyLowMemoryWarning on Android Trim and LowMemory events (flutter#18979)" (flutter/engine#19023) * 194acdf apply null safety syntax to mobile dart:ui (flutter/engine#18933) * b0a0e0e Roll Skia from 3d6bf04366f6 to 637838d20abd (2 revisions) (flutter/engine#19021) * be499ab Roll Fuchsia Mac SDK from gR0Zc... to H-uAk... (flutter/engine#19022) * 8c24c41 Roll Skia from 637838d20abd to ac16760df463 (1 revision) (flutter/engine#19025) * 7cb7003 onEndFrame JNI (flutter/engine#18867) * e3fdb23 [fuchsia] Add ability to configure separate data and asset dirs (flutter/engine#18858) * 983b6e1 Call Shell::NotifyLowMemory when backgrounded/memory pressure occurs on Android (flutter/engine#19026) * f7d241f Wire up channel for restoration data (flutter/engine#18042) * e84d497 Fix hit testing logic in fuchsia a11y (flutter/engine#19029) * 801559a Revert to last-known-good-rev of Dart SDK (flutter/engine#19031)
* 141ee78 Roll Dart SDK from 2b917f5b6a0e to 0fab083e1c2b (15 revisions) (flutter/engine#18974) * f5ab179 Call Shell::NotifyLowMemoryWarning on Android Trim and LowMemory events (flutter/engine#18979) * 4dabac9 Roll Fuchsia Linux SDK from 8AiUM... to ThzHh... (flutter/engine#18976) * 50cae02 Reland: Add RAII wrapper for EGLSurface (flutter/engine#18977) * db7f226 Include the memory header as unique_ptr is used in ASCII Trie. (flutter/engine#18978) * b19a17d Implement an EGL resource context for the Linux shell. (flutter/engine#18918) * ca26b75 Make Linux shell plugin constructor descriptions consistent (flutter/engine#18940) * efd1452 Roll Skia from 9c401e7e1ace to f69e40841eb9 (11 revisions) (flutter/engine#18983) * e5845af Put JNI functions under an interface (flutter/engine#18903) * 1ddc6e1 Call destructor and fix check (flutter/engine#18985) * 7f71f1d Roll Fuchsia Mac SDK from oWhyp... to gAD3P... (flutter/engine#18982) * 74291b7 Roll Dart SDK from 0fab083e1c2b to e62b89c56d01 (10 revisions) (flutter/engine#18987) * 2739bbf [web] Provide a hook to disable location strategy (flutter/engine#18969) * 336d000 Roll Skia from f69e40841eb9 to 553496b66f12 (2 revisions) (flutter/engine#18992) * b82769b Roll Skia from 553496b66f12 to 0ad37b87549b (2 revisions) (flutter/engine#18993) * f5ca58b Roll Dart SDK from e62b89c56d01 to b0d2b97d2cd7 (4 revisions) (flutter/engine#18994) * 2a82a08 [dart] Account for compiler api change (flutter/engine#19002) * 369e0a9 Add ui_benchmarks (flutter/engine#18945) * a0a92d6 Roll Skia from 0ad37b87549b to de175abede4d (1 revision) (flutter/engine#18995) * cea5a9c Roll Dart SDK from b0d2b97d2cd7 to f043f9e5f6ea (6 revisions) (flutter/engine#18997) * d417772 Roll Fuchsia Mac SDK from gAD3P... to Wj0yo... (flutter/engine#19001) * 4538622 Roll Skia from de175abede4d to 32d5cfa1f35e (15 revisions) (flutter/engine#19005) * 71fce02 Fix shift-tab not working by adding more GTK->GLFW key mappings. (flutter/engine#18988) * 5ddc122 Fix inverted check in creating resource surface (flutter/engine#18989) * 87d8888 Show warning if method response errors occur and error not handled. (flutter/engine#18946) * 5171fbd Roll Skia from 32d5cfa1f35e to 21bbfc6c2dfe (5 revisions) (flutter/engine#19006) * 4bd6aea Always send key events, even if they're used for text input. (flutter/engine#18991) * 9f898e9 Don't process key events when the text input is not requested (flutter/engine#18990) * 48d7091 Roll buildroot for Windows warning update (flutter/engine#19000) * 5f37029 Roll Dart SDK from f043f9e5f6ea to f0ea02bc51f8 (22 revisions) (flutter/engine#19010) * ac809b4 onBeginFrame JNI (flutter/engine#18866) * e1c622b Make SKSL caching test work on Fuchsia on arm64 (flutter/engine#18572) * 2651beb Exit before pushing a trace event when layer tree holder is empty (flutter/engine#19008) * acf048b Remove log added for local testing (flutter/engine#19012) * 1f3aa23 Roll Dart SDK from f0ea02bc51f8 to 0b64f5488965 (9 revisions) (flutter/engine#19013) * 8dcc95d Roll Fuchsia Mac SDK from Wj0yo... to gR0Zc... (flutter/engine#19015) * f6455fa Roll Dart SDK from 0b64f5488965 to 50836c171e91 (4 revisions) (flutter/engine#19017) * b2fea9d Roll Skia from 21bbfc6c2dfe to 30212b7941d6 (6 revisions) (flutter/engine#19009) * 0065646 Roll Skia from 30212b7941d6 to 3d6bf04366f6 (17 revisions) (flutter/engine#19020) * 0a852d8 Revert "Call Shell::NotifyLowMemoryWarning on Android Trim and LowMemory events (flutter#18979)" (flutter/engine#19023) * 194acdf apply null safety syntax to mobile dart:ui (flutter/engine#18933) * b0a0e0e Roll Skia from 3d6bf04366f6 to 637838d20abd (2 revisions) (flutter/engine#19021) * be499ab Roll Fuchsia Mac SDK from gR0Zc... to H-uAk... (flutter/engine#19022) * 8c24c41 Roll Skia from 637838d20abd to ac16760df463 (1 revision) (flutter/engine#19025) * 7cb7003 onEndFrame JNI (flutter/engine#18867) * e3fdb23 [fuchsia] Add ability to configure separate data and asset dirs (flutter/engine#18858) * 983b6e1 Call Shell::NotifyLowMemory when backgrounded/memory pressure occurs on Android (flutter/engine#19026) * f7d241f Wire up channel for restoration data (flutter/engine#18042) * e84d497 Fix hit testing logic in fuchsia a11y (flutter/engine#19029) * 801559a Revert to last-known-good-rev of Dart SDK (flutter/engine#19031)
This pull request contains one commit from gw280 that hasnt landed yet, we can pull it out and land it separately or just leave it in this PR.