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

Fix sampler offsets #38170

Merged
merged 6 commits into from
Dec 10, 2022
Merged

Conversation

jonahwilliams
Copy link
Member

@jonahwilliams jonahwilliams commented Dec 9, 2022

Sampler offsets also need to be configured, as a sampled image is both an image and a sampler and they use different fields.

Additionally remove remmaping of floats. Even though this corrects the order in the shader, the logic we have for writing the floats into the storage buffer apparently accounts for this.

@jonahwilliams jonahwilliams marked this pull request as ready for review December 10, 2022 00:00
@jonahwilliams
Copy link
Member Author

@zanderso do you know what the right thing to do with the license is for the third_party dir?

@zanderso
Copy link
Member

It looks like the license check script is happy with how you have things here modulo wanting the new license added to the golden. However, since the test shaders won't appear in the engine binary, as the license check script does in other places, I think it can skip the test shaders directory.

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 Dec 10, 2022
@auto-submit auto-submit bot merged commit 690f0e8 into flutter:main Dec 10, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 10, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 10, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2022
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Dec 11, 2022
…116843)

* 6b1c0c23f [Impeller Scene] Convert vertex positions to match Impeller's clip space orientation (flutter/engine#38174)

* 41ec2804a Roll Fuchsia Linux SDK from rRJIjuO-dPNCpCTd9... to 8O5rMR_ehMaL3YhZ5... (flutter/engine#38177)

* 3dfd13f1d Roll Skia from 1b194c67700e to 491f5c134f76 (2 revisions) (flutter/engine#38182)

* 690f0e81c Fix sampler offsets (flutter/engine#38170)

* f24f2cc0a Roll Skia from 491f5c134f76 to 0d482f9fa8b3 (1 revision) (flutter/engine#38183)

* fbb79e704 [Impeller Scene] Refactor Nodes/Meshes for simplicity and GLTF compatibility (flutter/engine#38180)
jonahwilliams added a commit to jonahwilliams/engine that referenced this pull request Dec 12, 2022
* [impeller] dont remap floats

* ++

* Update fragment_shader_test.dart

* ++:

* ++
loic-sharma pushed a commit to loic-sharma/flutter-engine that referenced this pull request Dec 16, 2022
* [impeller] dont remap floats

* ++

* Update fragment_shader_test.dart

* ++:

* ++
itsjustkevin pushed a commit that referenced this pull request Dec 16, 2022
* [Impeller] order metal samplers according to declared order and not usage order (#38115)

* [Impeller] order metal samplers according to declared order and not use order

* ++

* always enabl remapping

* Revert "always enabl remapping"

This reverts commit 2fffb05.

* ++

* add test

* ++

* ++

* only run on mac

* Fix sampler offsets (#38170)

* [impeller] dont remap floats

* ++

* Update fragment_shader_test.dart

* ++:

* ++
loic-sharma pushed a commit to loic-sharma/flutter-engine that referenced this pull request Jan 3, 2023
* [impeller] dont remap floats

* ++

* Update fragment_shader_test.dart

* ++:

* ++
gspencergoog pushed a commit to gspencergoog/flutter that referenced this pull request Jan 19, 2023
…lutter#116843)

* 6b1c0c23f [Impeller Scene] Convert vertex positions to match Impeller's clip space orientation (flutter/engine#38174)

* 41ec2804a Roll Fuchsia Linux SDK from rRJIjuO-dPNCpCTd9... to 8O5rMR_ehMaL3YhZ5... (flutter/engine#38177)

* 3dfd13f1d Roll Skia from 1b194c67700e to 491f5c134f76 (2 revisions) (flutter/engine#38182)

* 690f0e81c Fix sampler offsets (flutter/engine#38170)

* f24f2cc0a Roll Skia from 491f5c134f76 to 0d482f9fa8b3 (1 revision) (flutter/engine#38183)

* fbb79e704 [Impeller Scene] Refactor Nodes/Meshes for simplicity and GLTF compatibility (flutter/engine#38180)
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants