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

[Impeller] Do not pass the depfile flag when creating a shader bundle in ImpellerC #49114

Merged
merged 1 commit into from
Dec 16, 2023

Conversation

jason-simmons
Copy link
Member

@jason-simmons jason-simmons commented Dec 15, 2023

Shader bundles only produce the flat buffer output and do not write a depfile.

Copy link
Member

@bdero bdero left a comment

Choose a reason for hiding this comment

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

LGTM! Just a nit around what guard to use for these options.

"$shader_target_flag",
]

if (!shader_bundle) {
depfile_path = "$generated_dir/{{source_file_part}}.d"
Copy link
Member

@bdero bdero Dec 15, 2023

Choose a reason for hiding this comment

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

Huh, it's weird that using source_file_part wasn't erroring out for action/compiled_action like the other source-based vars did when using single-invocation mode.

I think moving this behind the !single_invocation guard below would make the most sense. Even though shader_bundle mode is technically the only situation where we'll use single_invocation, we'll need to switch --iplr to behave similarly in the future once we change it to pack multiple backends into a single iplr for RuntimeEffect support on Android.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

(source_file_part was being replaced with an empty string in the depfile path when single invocation mode invoked an action without a foreach)

@jason-simmons jason-simmons force-pushed the iplr_shader_bundle_depfile branch from 7ca1ed7 to 1d110d5 Compare December 15, 2023 23:13
@jason-simmons jason-simmons force-pushed the iplr_shader_bundle_depfile branch from 1d110d5 to 25866cd Compare December 15, 2023 23:38
@jason-simmons jason-simmons added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 16, 2023
@auto-submit auto-submit bot merged commit 539e34d into flutter:main Dec 16, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 16, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Dec 16, 2023
…140262)

flutter/engine@ca329dd...74e4965

2023-12-16 dnfield@google.com Statically link swiftshader into flutter_tester (flutter/engine#48708)
2023-12-16 jason-simmons@users.noreply.github.com [Impeller] Do not pass the depfile flag when creating a shader bundle in ImpellerC (flutter/engine#49114)
2023-12-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Run tests on macOS 13 exclusively" (flutter/engine#49115)
2023-12-15 dnfield@google.com Roll SwiftShader to 2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f (flutter/engine#49112)

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 jsimmons@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
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants