Skip to content

/ webrender

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 #3799

Merged
merged 27 commits into from Nov 25, 2019
Merged

Sync changes from mozilla-central #3799

merged 27 commits into from Nov 25, 2019

Conversation

@moz-gfx
Copy link

moz-gfx commented Nov 15, 2019

No description provided.

Glenn Watson @moz-gfx
Bug 1591754 - Fix incorrect surface deletions when frames are skipped…
Loading status checks…
6d57815 
…. r=nical

If the render backend is producing frames too quickly for the
renderer thread to consume, old frames are dropped in favor of
the most recent frame.

When this occurs, we need to ensure that any native surface updates
from the skipped frame are also applied. Otherwise, the state of
the native surfaces list can get out of sync between the renderer
and render backend threads.

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

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

moz-gfx commented Nov 15, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2019

📌 Commit 6d57815 has been approved by moz-gfx
@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2019

⌛ Testing commit 6d57815 with merge b169db2...
bors-servo added a commit that referenced this pull request Nov 15, 2019
@bors-servo
Auto merge of #3799 - moz-gfx:wrupdater, r=moz-gfx
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b169db2 
Sync changes from mozilla-central
@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2019

💔 Test failed - status-taskcluster
@emilio @moz-gfx
Bug 1564873 - Stop using mem::uninitialized to pass memory to the GPU…
Loading status checks…
1db1b2f 
…. r=Gankro

Use Vec::reserve + as_ptr, then raw pointers.

Alternative is to require T: Default, and then push T::default() or something.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/582c1acfb3483e087316793a965497b9dfdbc208
@moz-gfx
Copy link
Author

moz-gfx commented Nov 19, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

💡 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 Nov 19, 2019

📌 Commit 6d57815 has been approved by moz-gfx
aosmond and others added 9 commits Nov 21, 2019
@aosmond @moz-gfx
Bug 1589198 - Snap the picture's precise local rect the same as the e…
d981ef3 
…stimated local rect. r=kvark

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/a3a7133456b43bf3ba28681de8801384ef2986b7
@emilio @moz-gfx
Bug 1564873 - Fix straight-forward uses of mem::uninitialized in webr…
8b5d352 
…ender. r=nical

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/82e4062e839a57c0dbcb08df9965883c162eb8d1
@dvarga1989 @moz-gfx
Backed out changeset a3a7133456b4 (bug 1589198) for reftest at layout…
98d7fa0 
…/reftests/svg/filters/filter-nested-filtering-02.svg. On a CLOSED TREE

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/981d7988a2797e13e84ab57859e4e277ea46962b
@emilio @moz-gfx
Bug 1587468 - Update serde and related crates. r=nical
3bc0039 
We are no longer using a pinned version of serde, so update to avoid the
dependency on older syn / quote / etc.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/285df50f96b2249bc9dc424a4b05eb166b55715c
@kvark @moz-gfx
Bug 1597319 - Use rounded rect FAST_PATH more agressively r=gw
e09ffb5 
Differential Revision: https://phabricator.services.mozilla.com/D53999

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/d65ded00cb51c7c5e3e1a23145b2a8bf15e5e52e
@shindli @moz-gfx
Backed out changeset d65ded00cb51 (bug 1597319) for causing wrench bu…
98965de 
…stages CLOSED TREE

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/dd24ce6a2b16006b9c52d275643523e34b15c712
@kvark @moz-gfx
Bug 1597319 - Use rounded rect FAST_PATH more agressively r=gw
61a9d2e 
Differential Revision: https://phabricator.services.mozilla.com/D53999

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/ab47a4eac76c3f7166c9a4d6ae84da926c92e166
@nbeleuzu @moz-gfx
Backed out changeset ab47a4eac76c (bug 1597319) for WR bustages on pe…
3c9fcf2 
…rspective-box-shadow.yaml . CLOSED TREE

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/5caface7b2afcb648443a82ca9f4146b9da1d672
@kvark @moz-gfx
Bug 1597319 - Use rounded rect FAST_PATH more agressively r=gw
Loading status checks…
c15e972 
Differential Revision: https://phabricator.services.mozilla.com/D53999

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

moz-gfx commented Nov 21, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2019

📌 Commit 1db1b2f has been approved by moz-gfx
Glenn Watson and others added 9 commits Nov 22, 2019
Glenn Watson @moz-gfx
Bug 1598448 - Change compositor example to use EGLImage instead of pb…
02ba175 
…uffer. r=sotaro

Update the example compositor implementation to use the faster
EGLImage technique that the Gecko implementation now uses.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/59e0b3d74d196aee14cd7b01ad5fee5e70adeca7
@dvarga1989 @moz-gfx
Backed out changeset 59e0b3d74d19 (bug 1598448) for webrender-lint-ti…
17f9035 
…dy fail. On a CLOSED TREE

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/a9e6eb217408fef66b07d73c91f138caf0feee94
@nical @moz-gfx
Bug 1594128 - Only include shader sources once during parsing. r=gw
6c7a819 
This chanes the shader parsing code to only inject #included shader sources once (the first time) if they are included multiple times.
This will allow some extra flexibility needed by the multi-brush shader.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/e894fff26e422166618de4401464929e9b9cb62e
@nical @moz-gfx
Bug 1594128 - Encode the brush shader type in the instance attributes…
7119ffb 
…. r=gw

This will allow the upcoming super-brush shader to select its behavior at runtime.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/74554530a51089d0145a91587ab1e6d4e8c762f2
@nical @moz-gfx
Bug 1594128 - Dynamically choose the brush kind in the shader. r=gw
6714957 
This is an experiment with only image and solid to see what the infrastructure can be like.
If it works out I'll extend the it with more brush types. More work will be needed to get text rendering in there as well.

The multi-brush shader includes all brushes that it potentially needs suport for. Which brushes actually get compiled in is then specified via WR_FEATURE defines.
Since brushes can't have the same names for their entry points, they specify the function to use via a macros (WR_BRUSH_VS_FUNCTION and WR_BRUSH_FS_FUNCTION).

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/912718966a67fb7cf2f21c2690dce0bd5822377a
@nical @moz-gfx
Bug 1594128 - Use generic slots for text, image and solid shader vary…
9f0947a 
…ings. r=gw

The 'multi-brush' shader will have to dynamically switch between different brushes. In order to support that without needing the sum of all brush varying locations, allow aliasing a number of generic slots.
This patch makes the assumption that one a vec2 and a vec4 cost the same amount of varying register space, which is suggested by the glsl specification about shader locations. If it is not the case we can add more granularity to the varying slots which are all vec4 at the moment. This also assumes that an unused varying is always optimized out.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/bb21ea50b1e90bdafd620695b691227c6ac8295c
@nical @moz-gfx
Bug 1594128 - Generic varyings for ps_text_run.glsl. r=gw
7ebbd72 
Differential Revision: https://phabricator.services.mozilla.com/D53728

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/0af881b4707af8d28c78d35ea50f2c4152164e28
@nical @moz-gfx
Bug 1594128 - Add brush_blend to the multi-brush infrastructure. r=gw
487430e 
Differential Revision: https://phabricator.services.mozilla.com/D53993

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/4077b95429c0c6bd64c27ecbc99195f0a995f253
@nical @moz-gfx
Bug 1594128 - Add brush_mix_blend to the multi-brush infrastructure. …
357b923 
…r=gw

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/a2717dc2c87bc33f2524074d71b8a75e64ba6ebc
nical added 4 commits Nov 22, 2019
@nical @moz-gfx
Bug 1594128 - Add brush_linear_gradient to the multi-brush infrastruc…
e7b059c 
…ture. r=gw

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/a215df75f72fe4031570fe5d9765f103e73cdaeb
@nical @moz-gfx
Bug 1594128 - Add brush_radial_gradient to the multi-brush infrastruc…
f1b3aa6 
…ture. r=gw

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/6b339f631b3d6753afa82425708cf2e8786edc34
@nical @moz-gfx
Bug 1594128 - Tiddy up the multi-brush code. r=gw
07d2167 
Differential Revision: https://phabricator.services.mozilla.com/D53998

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/f83f356ca522614098013cc0b8178b48e01f6215
@nical @moz-gfx
Bug 1594128 - Don't rely on high bits to store the brush_kind varying…
Loading status checks…
71f98aa 
…. r=gw

In GLES the default precision for ints is only 16 bits in the fragment shader.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/7a29d7acf94c6512b4535d4ec836af6b9c8bc371
@moz-gfx
Copy link
Author

moz-gfx commented Nov 22, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2019

📌 Commit c15e972 has been approved by moz-gfx
@aciure @moz-gfx
Backed out 11 changesets (bug 1594128) for several regressions a=backout
Loading status checks…
b864eed 
Backed out changeset 7a29d7acf94c (bug 1594128)
Backed out changeset f83f356ca522 (bug 1594128)
Backed out changeset 6b339f631b3d (bug 1594128)
Backed out changeset a215df75f72f (bug 1594128)
Backed out changeset a2717dc2c87b (bug 1594128)
Backed out changeset 4077b95429c0 (bug 1594128)
Backed out changeset 0af881b4707a (bug 1594128)
Backed out changeset bb21ea50b1e9 (bug 1594128)
Backed out changeset 912718966a67 (bug 1594128)
Backed out changeset 74554530a510 (bug 1594128)
Backed out changeset e894fff26e42 (bug 1594128)

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/0a724aa35cdbb7ceef51f7af26a6aa7b5058682f
@moz-gfx
Copy link
Author

moz-gfx commented Nov 24, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 24, 2019

📌 Commit 71f98aa has been approved by moz-gfx
Glenn Watson and others added 2 commits Nov 25, 2019
Glenn Watson @moz-gfx
Bug 1598448 - Change compositor example to use EGLImage instead of pb…
fb19a78 
…uffer. r=sotaro

Update the example compositor implementation to use the faster
EGLImage technique that the Gecko implementation now uses.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/844707d4b9ef69eed91400566eb5d0d46956de0d
@aciure @moz-gfx
Merge autoland to mozilla-central. a=merge
Loading status checks…
e3ce174 
[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/fddc190c5af5d9844851e7790602a47b7979536f
@moz-gfx
Copy link
Author

moz-gfx commented Nov 25, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 25, 2019

📌 Commit b864eed has been approved by moz-gfx
@jdm
Copy link
Member

jdm commented Nov 25, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 25, 2019

📌 Commit e3ce174 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Nov 25, 2019

⌛ Testing commit e3ce174 with merge 9f12a81...
bors-servo added a commit that referenced this pull request Nov 25, 2019
@bors-servo
Auto merge of #3799 - moz-gfx:wrupdater, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9f12a81 
Sync changes from mozilla-central
@bors-servo
Copy link
Contributor

bors-servo commented Nov 25, 2019

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: jdm
Pushing 9f12a81 to master...
@bors-servo bors-servo merged commit e3ce174 into servo:master Nov 25, 2019
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.