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

Merged
merged 16 commits into from Nov 27, 2019
Merged

Sync changes from mozilla-central #3802

merged 16 commits into from Nov 27, 2019

Conversation

@moz-gfx
Copy link

moz-gfx commented Nov 26, 2019

No description provided.

nical added 12 commits Nov 26, 2019
@nical @moz-gfx
Bug 1594128 - Only include shader sources once during parsing. r=gw
35d894c 
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/6762aab1845925b804e4f116cb169a5e614844fc
@nical @moz-gfx
Bug 1594128 - Encode the brush shader type in the instance attributes…
7c681e0 
…. 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/6386aa316da906a59f00cd2191105f4c1cefb833
@nical @moz-gfx
Bug 1594128 - Dynamically choose the brush kind in the shader. r=gw
3b5d66c 
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/550591122788f2adb78902e63a885f34e41fed49
@nical @moz-gfx
Bug 1594128 - Use generic slots for text, image and solid shader vary…
3fa7486 
…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/e5f6739f790d1bd685a41fc06cad3ee024185155
@nical @moz-gfx
Bug 1594128 - Generic varyings for ps_text_run.glsl. r=gw
542ad4f 
Differential Revision: https://phabricator.services.mozilla.com/D53728

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/0d89ea8665dfc2c9efc40054ecd29f5227172f06
@nical @moz-gfx
Bug 1594128 - Add brush_mix_blend to the multi-brush infrastructure. …
56376fb 
…r=gw

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/5768997fb3919368e763df2c7cb9198b6d3995ff
@nical @moz-gfx
Bug 1594128 - Add brush_linear_gradient to the multi-brush infrastruc…
5c50c40 
…ture. r=gw

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

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

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

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/beeeb1889588204a7865327c4e2bf7710b17a938
@nical @moz-gfx
Bug 1594128 - Don't rely on high bits to store the brush_kind varying…
cdb0bff 
…. 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/a8ee6dbf146b0d1ef4d3348539d1ad439f18a26c
@nical @moz-gfx
Bug 1594128 - Work around Mac GLSL compiler bug. r=kvark
Loading status checks…
73416db 
The GLSL compiler appears to get confused by a function that just returns a defined constant.
See https://github.com/servo/webrender/wiki/Driver-issues#bug-1594128---glsl-on-macos-is-confused-by-a-function-that-just-returns-a-constant

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

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

moz-gfx commented Nov 26, 2019

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

bors-servo commented Nov 26, 2019

📌 Commit 73416db has been approved by moz-gfx
bors-servo added a commit that referenced this pull request Nov 26, 2019
@bors-servo
Auto merge of #3802 - 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…
627b92c 
Sync changes from mozilla-central
@bors-servo
Copy link
Contributor

bors-servo commented Nov 26, 2019

⌛ Testing commit 73416db with merge 627b92c...
@bors-servo
Copy link
Contributor

bors-servo commented Nov 26, 2019

💔 Test failed - status-taskcluster
nical and others added 3 commits Nov 27, 2019
@nical @moz-gfx
Bug 1596086 - Detect hard gardient stops using offsets instead of col…
b3fa973 
…ors. r=gw

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/57869dbf0a8be30490a70702edfa32038ee1dbf6
@nical @moz-gfx
Bug 1596086 - Add a reftest. r=gw
1e631c2 
Differential Revision: https://phabricator.services.mozilla.com/D54612

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/00ccdb940ea2b0c4be38b4b80e0c76b17ac9c6c4
@nbeleuzu @moz-gfx
Backed out 4 changesets (bug 1596086) for reftest failures on reftest…
Loading status checks…
c9e9625 
….list . CLOSED TREE

Backed out changeset 651a7556124b (bug 1596086)
Backed out changeset ab2e0e2a9048 (bug 1596086)
Backed out changeset 00ccdb940ea2 (bug 1596086)
Backed out changeset 57869dbf0a8b (bug 1596086)

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

moz-gfx commented Nov 27, 2019

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

bors-servo commented Nov 27, 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 27, 2019

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

bors-servo commented Nov 27, 2019

⌛ Testing commit c9e9625 with merge 681a067...
bors-servo added a commit that referenced this pull request Nov 27, 2019
@bors-servo
Auto merge of #3802 - 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…
681a067 
Sync changes from mozilla-central
@bors-servo
Copy link
Contributor

bors-servo commented Nov 27, 2019

💔 Test failed - status-taskcluster
@AndreeaPavel @moz-gfx
Backed out 12 changesets (bug 1594128) because of rendering regressio…
Loading status checks…
317c40e 
…ns a=backout

Backed out changeset 39f51911efa8 (bug 1594128)
Backed out changeset a8ee6dbf146b (bug 1594128)
Backed out changeset beeeb1889588 (bug 1594128)
Backed out changeset 84e767a37637 (bug 1594128)
Backed out changeset 54efcc9976cf (bug 1594128)
Backed out changeset 5768997fb391 (bug 1594128)
Backed out changeset 0d89ea8665df (bug 1594128)
Backed out changeset ba4668d01dc5 (bug 1594128)
Backed out changeset e5f6739f790d (bug 1594128)
Backed out changeset 550591122788 (bug 1594128)
Backed out changeset 6386aa316da9 (bug 1594128)
Backed out changeset 6762aab18459 (bug 1594128)

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

moz-gfx commented Nov 27, 2019

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

bors-servo commented Nov 27, 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 27, 2019

📌 Commit 317c40e has been approved by moz-gfx
@bors-servo
Copy link
Contributor

bors-servo commented Nov 27, 2019

⌛ Testing commit 317c40e with merge afde2be...
bors-servo added a commit that referenced this pull request Nov 27, 2019
@bors-servo
Auto merge of #3802 - 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…
afde2be 
Sync changes from mozilla-central
@bors-servo
Copy link
Contributor

bors-servo commented Nov 27, 2019

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: moz-gfx
Pushing afde2be to master...
@bors-servo bors-servo merged commit 317c40e into servo:master Nov 27, 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

5 participants
@moz-gfx @bors-servo @nical @nbeleuzu @AndreeaPavel
You can’t perform that action at this time.