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

Update webrender #22598

Merged
merged 3 commits into from Jan 18, 2019

Conversation

Projects
None yet
8 participants
@jdm
Copy link
Member

jdm commented Jan 3, 2019

Depends on servo/rust-offscreen-rendering-context#132.

This change is Reviewable

@highfive

This comment has been minimized.

Copy link

highfive commented Jan 3, 2019

Heads up! This PR modifies the following files:

  • @edunham: servo-tidy.toml
  • @emilio: components/layout/display_list/webrender_helpers.rs
@highfive

This comment has been minimized.

Copy link

highfive commented Jan 3, 2019

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 3, 2019

There were surprisingly few public API changes since the last update.

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 3, 2019

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 3, 2019

⌛️ Trying commit 7525532 with merge 40a1c2c...

bors-servo added a commit that referenced this pull request Jan 3, 2019

Auto merge of #22598 - jdm:update-wr, r=<try>
Update webrender

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22598)
<!-- Reviewable:end -->
Show resolved Hide resolved servo-tidy.toml
@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 3, 2019

💔 Test failed - magicleap

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 3, 2019

So far:

  • servo/webrender@ac5ae58#diff-8648af9200d5c000491095f37a39126cR101 uses target_os="android" but won't work on magic leap devices
  • servo/webrender@cef110a caused /_webgl/conformance/textures/misc/texture-size-cube-maps.html and /_webgl/conformance/canvas/to-data-url-test.html to panic inside of WR code that binds the external WebGL texture
  • /css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html and /css/css-transforms/transform3d-perspective-005.html now pass
  • /xhr/setrequestheader-header-allowed.htm now passes (used to be a crash)
  • the img_simple.html servodriver test is not passing
@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 7, 2019

☔️ The latest upstream changes (presumably #22641) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm jdm force-pushed the jdm:update-wr branch from 7525532 to 4b6c9a1 Jan 9, 2019

@highfive highfive removed the S-tests-failed label Jan 9, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 9, 2019

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 9, 2019

⌛️ Trying commit 4b6c9a1 with merge 5b63a5c...

bors-servo added a commit that referenced this pull request Jan 9, 2019

Auto merge of #22598 - jdm:update-wr, r=<try>
Update webrender

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22598)
<!-- Reviewable:end -->
@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 9, 2019

Requires https://bugzilla.mozilla.org/show_bug.cgi?id=1518937 and then a corresponding webrender sync.

@jdm jdm changed the title Update webrender [wip] Update webrender Jan 9, 2019

@jdm jdm removed the S-awaiting-review label Jan 9, 2019

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 9, 2019

💔 Test failed - linux-rel-wpt

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 10, 2019

One new reftest failure (/css/filter-effects/blur-clip-stacking-context-001.html ):
Test:
screen shot 2019-01-09 at 6 59 31 pm
Ref:
screen shot 2019-01-09 at 6 59 36 pm

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 10, 2019

Windows:

rror[E0308]: mismatched types
  --> components\gfx\platform\windows\font_template.rs:63:18
   |
63 |             Some(descriptor_from_atom(&self.identifier))
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `dwrote::FontDescriptor`, found a different struct `dwrote::FontDescriptor`
   |
   = note: expected type `dwrote::FontDescriptor` (struct `dwrote::FontDescriptor`)
              found type `dwrote::FontDescriptor` (struct `dwrote::FontDescriptor`)
note: Perhaps two different versions of crate `dwrote` are being used?
  --> components\gfx\platform\windows\font_template.rs:63:18
   |
63 |             Some(descriptor_from_atom(&self.identifier))
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error

@jdm jdm force-pushed the jdm:update-wr branch from 4b6c9a1 to 56ff74d Jan 10, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 16, 2019

No blocking dependencies any more. Ready for review.

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 16, 2019

Note that the changes in webrender_helpers.rs in 8ce6cbf were mostly written by @kvark in servo/webrender#3251 (comment).

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 16, 2019

☔️ The latest upstream changes (presumably #22703) made this pull request unmergeable. Please resolve the merge conflicts.

@nox

nox approved these changes Jan 17, 2019

@@ -106,7 +106,7 @@ pub fn draw_img(

gl.bind_framebuffer(gl::FRAMEBUFFER, 0);

gl.delete_buffers(&render_target_info.texture_ids);
gl.delete_textures(&render_target_info.texture_ids);

This comment has been minimized.

@nox

nox Jan 17, 2019

Member

Ouch. :)

@@ -1,6 +1,4 @@
[to-data-url-test.html]
expected:
if os == "linux": CRASH

This comment has been minimized.

@nox

nox Jan 17, 2019

Member

Nice!

@nox

This comment has been minimized.

Copy link
Member

nox commented Jan 17, 2019

r=me but Cargo.lock conflicts.

@jdm jdm force-pushed the jdm:update-wr branch 2 times, most recently from 67c5cc5 to f8e061b Jan 17, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 17, 2019

@bors-servo r=nox

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 17, 2019

📌 Commit f8e061b has been approved by nox

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 17, 2019

⌛️ Testing commit f8e061b with merge ebf2e7e...

bors-servo added a commit that referenced this pull request Jan 17, 2019

Auto merge of #22598 - jdm:update-wr, r=nox
Update webrender

Depends on servo/rust-offscreen-rendering-context#132.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22598)
<!-- Reviewable:end -->

@jdm jdm force-pushed the jdm:update-wr branch from f8e061b to 878f020 Jan 18, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

jdm commented Jan 18, 2019

@bors-servo r=nox

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 18, 2019

📌 Commit 878f020 has been approved by nox

bors-servo added a commit that referenced this pull request Jan 18, 2019

Auto merge of #22598 - jdm:update-wr, r=nox
Update webrender

Depends on servo/rust-offscreen-rendering-context#132.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22598)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 18, 2019

⌛️ Testing commit 878f020 with merge 42b6004...

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 18, 2019

@bors-servo bors-servo merged commit 878f020 into servo:master Jan 18, 2019

3 checks passed

Taskcluster (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