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

Sync changes from mozilla-central gfx/wr #3882

Merged
merged 27 commits into from Mar 12, 2020
Merged

Conversation

@moz-gfx
Copy link

moz-gfx commented Mar 11, 2020

No description provided.

cbrewster and others added 23 commits Mar 11, 2020
… feGaussianBlur-5-ref.svg CLOSED TREE

Backed out changeset a561435c24cf (bug 1618000)
Backed out changeset e720691ccf17 (bug 1618000)

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/9c027d62be503fe8c584e02d65fd57246900063d
…rmuizel,gw

Add annotations to vertex shaders so that SWGL can detect when a vertex attribute
is generated by per-instance data rather than per-vertex data.

Differential Revision: https://phabricator.services.mozilla.com/D65614

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/ad7f43d72b08243106fddc460f2205926d4f87bf
Backed out changeset 29f9f745ff65 (bug 1612941)
Backed out changeset d92e03315f8d (bug 1612941)
Backed out changeset 9b1360daa75a (bug 1612941)
Backed out changeset ad7f43d72b08 (bug 1612941)
Backed out changeset 30b28118362a (bug 1612941)
Backed out changeset 76f80dce8875 (bug 1612941)
Backed out changeset 375896f494ae (bug 1612941)
Backed out changeset bd8ba66dc2ac (bug 1612941)
Backed out changeset 54ec5a6e8e45 (bug 1612941)
Backed out changeset 419105739e53 (bug 1612941)
Backed out changeset c198dedeaa1b (bug 1612941)
Backed out changeset 87ddcdfc5fcf (bug 1612941)

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/1b8df9d39a0fc712b6f8ca07865b578f1e724fae
…rmuizel,gw

Add annotations to vertex shaders so that SWGL can detect when a vertex attribute
is generated by per-instance data rather than per-vertex data.

Differential Revision: https://phabricator.services.mozilla.com/D65614

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/2e0c9b9bd50759b80c9075c4ebb795a2031d4c35
…CLOSED TREE

Backed out changeset bbb8ec38f354 (bug 1612941)
Backed out changeset cd798d2a0433 (bug 1612941)
Backed out changeset c02c4c5bf7f7 (bug 1612941)
Backed out changeset 2e0c9b9bd507 (bug 1612941)
Backed out changeset ec0fffd12dec (bug 1612941)
Backed out changeset 2d6f65fe6ec0 (bug 1612941)
Backed out changeset dd1a92041bb4 (bug 1612941)
Backed out changeset 3cae17a5ec80 (bug 1612941)
Backed out changeset edfca5676513 (bug 1612941)
Backed out changeset f94d5c7cee41 (bug 1612941)
Backed out changeset 67bba000daba (bug 1612941)
Backed out changeset 60151122db4d (bug 1612941)

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/005382a5a58ff70933c9f535b3a8e6158ccccea6
@moz-gfx
Copy link
Author

moz-gfx commented Mar 11, 2020

@bors-servo r=auto

@bors-servo
Copy link
Contributor

bors-servo commented Mar 11, 2020

📌 Commit e204dbd has been approved by auto

@bors-servo
Copy link
Contributor

bors-servo commented Mar 11, 2020

Testing commit e204dbd with merge 5dc98eb...

bors-servo added a commit that referenced this pull request Mar 11, 2020
Sync changes from mozilla-central gfx/wr
@bors-servo
Copy link
Contributor

bors-servo commented Mar 11, 2020

💔 Test failed - status-appveyor

fschutt and others added 2 commits Mar 12, 2020
DisplayItemBuilder now has methods:
```
void StartGroup(nsPaintedDisplayItem* aItem);
void CancelGroup();
void FinishGroup();
bool ReuseItem(nsPaintedDisplayItem* aItem);
```
WebRender display items previously created between calls to StartGroup() and FinishGroup() will be reused by a call to ReuseItem(),
which will push DisplayItem::ReuseItem(key) to WR display list, if the Gecko display item has been retained and reused.
Calling CancelGroup() will discard the display items that have been pushed after calling StartGroup().

For example, inside nsDisplayBackgroundColor::CreateWebRenderCommands():
```
aBuilder.StartGroup(this);
aBuilder.PushRect(r, r, !BackfaceIsHidden(),
                  wr::ToColorF(ToDeviceColor(mColor)));
aBuilder.FinishGroup();
```

Differential Revision: https://phabricator.services.mozilla.com/D65356

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/91760460f91496fb2262242dcdf7c0deb311978c
AndreeaPavel and others added 2 commits Mar 12, 2020
DisplayItemBuilder now has methods:
```
void StartGroup(nsPaintedDisplayItem* aItem);
void CancelGroup();
void FinishGroup();
bool ReuseItem(nsPaintedDisplayItem* aItem);
```
WebRender display items previously created between calls to StartGroup() and FinishGroup() will be reused by a call to ReuseItem(),
which will push DisplayItem::ReuseItem(key) to WR display list, if the Gecko display item has been retained and reused.
Calling CancelGroup() will discard the display items that have been pushed after calling StartGroup().

For example, inside nsDisplayBackgroundColor::CreateWebRenderCommands():
```
aBuilder.StartGroup(this);
aBuilder.PushRect(r, r, !BackfaceIsHidden(),
                  wr::ToColorF(ToDeviceColor(mColor)));
aBuilder.FinishGroup();
```

Differential Revision: https://phabricator.services.mozilla.com/D65356

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/f792d895cdf8f3819b987389301e98b5873123d8
@moz-gfx
Copy link
Author

moz-gfx commented Mar 12, 2020

@bors-servo r=auto

@bors-servo
Copy link
Contributor

bors-servo commented Mar 12, 2020

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
@bors-servo
Copy link
Contributor

bors-servo commented Mar 12, 2020

📌 Commit e204dbd has been approved by auto

@jdm
Copy link
Member

jdm commented Mar 12, 2020

@jdm
Copy link
Member

jdm commented Mar 12, 2020

@bors-servo r=auto

@bors-servo
Copy link
Contributor

bors-servo commented Mar 12, 2020

📌 Commit 672b9f5 has been approved by auto

@bors-servo
Copy link
Contributor

bors-servo commented Mar 12, 2020

Testing commit 672b9f5 with merge c8ec68f...

@bors-servo
Copy link
Contributor

bors-servo commented Mar 12, 2020

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: auto
Pushing c8ec68f to master...

@bors-servo bors-servo merged commit c8ec68f into servo:master Mar 12, 2020
3 checks passed
3 checks passed
Community-TC (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
You can’t perform that action at this time.