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

Merged
merged 4 commits into from Apr 8, 2020
Merged

Conversation

@moz-gfx
Copy link

moz-gfx commented Apr 7, 2020

No description provided.

Jim Blandy and others added 4 commits Apr 7, 2020
… texture function. r=cbrewster

The `sampleInUvRect` function in `gfx/wr/webrender/res/cs_svg_filter.glsl` calls
`texture`, passing the optional third argument that specifies a bias to the
sampler's level-of-detail calculation, used for mipmap interpolation. However,
the `texture` override in `gfx/wr/swgl/src/glsl.h` that accepts this parameter
is stubbed out, with an `assert(0)`. This causes twelve tests in
`gfx/wr/wrench/reftests/filters` to crash.

Nothing in Firefox uses mipmaps, and Servo doesn't use Software WebRender, so it
should be fine for that call to `texture` to simply not pass the level-of-detail
bias.

This patch makes that change.

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

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/89e164da5af7b9a9152deacdb06bb5b36d3bf2b8
…aders with PERSPECTIVE feature. r=jrmuizel

This implements Z plane clipping, gl_FragCoord.zw interpolation, and vertex attribute perspective-correction with support from the glsl-to-cxx compiler by using PERSPECTIVE feature in a WR shader.

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

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

moz-gfx commented Apr 7, 2020

@bors-servo r=auto

@bors-servo
Copy link
Contributor

bors-servo commented Apr 7, 2020

📌 Commit addf951 has been approved by auto

@bors-servo
Copy link
Contributor

bors-servo commented Apr 7, 2020

Testing commit addf951 with merge 31d618d...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2020

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

@bors-servo bors-servo merged commit 31d618d into servo:master Apr 8, 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
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

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