Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Impeller] uniform offsets account for size #39077

Merged
merged 2 commits into from
Jan 23, 2023

Conversation

jonahwilliams
Copy link
Member

Fixes flutter/flutter#118847

When reading from the uniform buffer account for vec2/3/4 uniforms being larger than a single float.

@flutter-dashboard

This comment was marked as outdated.

@@ -2097,11 +2097,11 @@ TEST_P(EntityTest, RuntimeEffect) {
contents->SetRuntimeStage(runtime_stage);

struct FragUniforms {
Scalar iTime;
Vector2 iResolution;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By re-arranging these uniforms we can observe that the shader does not work without this fix. Thus, tested.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't animate without the fix, because the first uniform gets data in 0, 1, and the second uniform gets the fixed data in 1 instead of at 2.

Copy link
Member

@zanderso zanderso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jonahwilliams jonahwilliams added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 23, 2023
@auto-submit auto-submit bot merged commit 42eec62 into flutter:main Jan 23, 2023
@jonahwilliams jonahwilliams deleted the remap_float_sampler_impeller branch January 23, 2023 22:26
zanderso pushed a commit to zanderso/engine that referenced this pull request Jan 24, 2023
* uniform offsets account for size

* re-arrange fixtures
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 24, 2023
…119081)

* 22084db7a Remove unnecessary null checks in doc snippet (flutter/engine#39071)

* f91890636 Roll Skia from f6a5c806294d to 1ccf2093cfa9 (2 revisions) (flutter/engine#39028)

* f02a70492 Roll Fuchsia Mac SDK from rQtxqj3gePeR-nTLv... to HxpwvvbQdk54L6_8q... (flutter/engine#39075)

* 42eec6280 [Impeller] uniform offsets account for size (flutter/engine#39077)

* b6a348a82 Ability to disable browser context menu (flutter/engine#38682)

* 1b51696eb Roll Skia from 1ccf2093cfa9 to 0328e12ab195 (59 revisions) (flutter/engine#39078)

* d83a705ef [embedder] Fix getting vkGetInstanceProcAddr (flutter/engine#39051)

* 973b01c40 Fix doc analyzer breakage (flutter/engine#39082)

* 55e9eafab Roll Dart SDK from 107a1280a61f to d1a0e860679e (2 revisions) (flutter/engine#39084)

* fa07c546c Roll Skia from 0328e12ab195 to 50d78376d30c (3 revisions) (flutter/engine#39086)

* 17abf1a9e Roll Fuchsia Linux SDK from GLRbnjiO5SbZKX-Us... to dWbkAZchFHtZE9Wt_... (flutter/engine#39087)

* 5c46d75f7 Roll Skia from 50d78376d30c to 90fda2e72314 (4 revisions) (flutter/engine#39089)

* 5b4e331a6 Add mmap dependency to flutter_frontend_server (flutter/engine#39090)

* 7f38d0d4f Migrate `@FfiNative` to `@Native` (flutter/engine#39034)

* 71ee5f19b Remove superfluous words from comments (flutter/engine#39068)
ricardoamador pushed a commit to ricardoamador/engine that referenced this pull request Jan 25, 2023
* uniform offsets account for size

* re-arrange fixtures
XilaiZhang pushed a commit that referenced this pull request Jan 30, 2023
* uniform offsets account for size

* re-arrange fixtures

Co-authored-by: Jonah Williams <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App e: impeller
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[Impeller] Float samplers can get re-ordered compared to SkSL
3 participants