Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] make sure buffers are 4 aligned for foreground color blending #53077

Merged
merged 4 commits into from
May 30, 2024

Conversation

gaaclarke
Copy link
Member

@gaaclarke gaaclarke commented May 28, 2024

fixes flutter/flutter#149216

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

return Emplace(reinterpret_cast<const void*>(&buffer), // buffer
sizeof(BufferType), // size
alignof(BufferType) // alignment
[[nodiscard]] BufferView Emplace(const BufferType& buffer,
Copy link
Member

Choose a reason for hiding this comment

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

ahh oops

EXPECT_EQ(buffer_view.range.length, 1u);
Entity entity;

std::optional<Entity> result = filter_contents.GetEntity(
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 crashes for me locally without the patch and with validations enabled. I wish I could get it to fail even without validations, but I don't think there is an easy way without gutting everything.

@gaaclarke gaaclarke marked this pull request as ready for review May 29, 2024 00:10
Copy link
Member

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

LGTM

@gaaclarke gaaclarke added the autosubmit Merge PR when tree becomes green via auto submit App label May 29, 2024
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 29, 2024
Copy link
Contributor

auto-submit bot commented May 29, 2024

auto label is removed for flutter/engine/53077, due to - The status or check suite Linux Web Framework tests has failed. Please fix the issues identified (or deflake) before re-applying this label.

@zanderso
Copy link
Member

From PR triage: @gaaclarke is this ready to land?

@gaaclarke
Copy link
Member Author

From PR triage: @gaaclarke is this ready to land?

Yep, ready. Looks like it got caught on a flake.

@gaaclarke gaaclarke added the autosubmit Merge PR when tree becomes green via auto submit App label May 30, 2024
@auto-submit auto-submit bot merged commit e4d3bb0 into flutter:main May 30, 2024
34 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 30, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 30, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 31, 2024
…149367)

flutter/engine@bf2e32d...4956e98

2024-05-30 yjbanov@google.com [semantics] fix dartdoc grammar (flutter/engine#53121)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 188ad395c3e7 to a058f601e1fb (1 revision) (flutter/engine#53131)
2024-05-30 daniel.l@hpcnt.com Replace several NSAssert with FML_CHECK/DCHECK to unblock the build (flutter/engine#53048)
2024-05-30 30870216+gaaclarke@users.noreply.github.com [Impeller] make sure buffers are 4 aligned for foreground color blending (flutter/engine#53077)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request May 31, 2024
…lutter#149367)

flutter/engine@bf2e32d...4956e98

2024-05-30 yjbanov@google.com [semantics] fix dartdoc grammar (flutter/engine#53121)
2024-05-30 skia-flutter-autoroll@skia.org Roll Skia from 188ad395c3e7 to a058f601e1fb (1 revision) (flutter/engine#53131)
2024-05-30 daniel.l@hpcnt.com Replace several NSAssert with FML_CHECK/DCHECK to unblock the build (flutter/engine#53048)
2024-05-30 30870216+gaaclarke@users.noreply.github.com [Impeller] make sure buffers are 4 aligned for foreground color blending (flutter/engine#53077)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
autosubmit Merge PR when tree becomes green via auto submit App e: impeller
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash in "Color Filter Cache" macrobenchmark
3 participants