Skip to content

/ servo

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 WR (new texture cache allocator, shader deinit path). #18096

Merged
merged 1 commit into from Aug 18, 2017
Merged

Update WR (new texture cache allocator, shader deinit path). #18096

merged 1 commit into from Aug 18, 2017

Conversation

@glennw
Copy link
Member

glennw commented Aug 15, 2017 •
edited by SimonSapin

This change is Reviewable
@glennw
Copy link
Member Author

glennw commented Aug 15, 2017

r? @emilio
@highfive highfive assigned emilio and unassigned cbrewster Aug 15, 2017
@glennw
Copy link
Member Author

glennw commented Aug 15, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 15, 2017

⌛ Trying commit 4e3a5b8 with merge 8b9f5d4...
bors-servo added a commit that referenced this pull request Aug 15, 2017
@bors-servo
Auto merge of #18096 - glennw:update-wr-deinit, r=<try>
Loading status checks…
8b9f5d4 
Update WR (new texture cache allocator, shader deinit path).
@bors-servo
Copy link
Contributor

bors-servo commented Aug 15, 2017

💔 Test failed - windows-msvc-dev
@jdm
Copy link
Member

jdm commented Aug 16, 2017 

error[E0425]: cannot find value `browser` in this scope
   --> main.rs:186:5
    |
186 |     browser.browser.deinit();
    |     ^^^^^^^ not found in this scope

error: aborting due to previous error
@jdm
jdm approved these changes Aug 16, 2017
View changes
Copy link
Member

jdm left a comment

I don't understand why that error is occurring, but otherwise this looks fine.
components/compositing/compositor.rs Outdated
@@ -340,6 +340,7 @@ impl webrender_api::RenderDispatcher for CompositorThreadDispatcher {
}
}


This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Aug 16, 2017

Member

nit: remove this.
@jdm jdm removed the S-awaiting-review label Aug 16, 2017
@glennw glennw force-pushed the glennw:update-wr-deinit branch from 4e3a5b8 to 4152e59 Aug 16, 2017
@glennw
Copy link
Member Author

glennw commented Aug 16, 2017

Rebased.
@glennw glennw force-pushed the glennw:update-wr-deinit branch from 4152e59 to 3877fab Aug 16, 2017
@glennw
Copy link
Member Author

glennw commented Aug 16, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

⌛ Trying commit 3877fab with merge 0e8f1f6...
bors-servo added a commit that referenced this pull request Aug 16, 2017
@bors-servo
Auto merge of #18096 - glennw:update-wr-deinit, r=<try>
Loading status checks…
0e8f1f6 
Update WR (new texture cache allocator, shader deinit path).

<!-- 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/18096)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

💔 Test failed - android
@jdm
Copy link
Member

jdm commented Aug 16, 2017

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

⌛ Trying commit 3877fab with merge 68c3e97...
bors-servo added a commit that referenced this pull request Aug 16, 2017
@bors-servo
Auto merge of #18096 - glennw:update-wr-deinit, r=<try>
Loading status checks…
68c3e97 
Update WR (new texture cache allocator, shader deinit path).

<!-- 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/18096)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

💔 Test failed - mac-rel-wpt4
@jdm
Copy link
Member

jdm commented Aug 16, 2017 

  ▶ FAIL [expected PASS] /_mozilla/mozilla/webgl/tex_image_2d_mipmap.html
  └   → /_mozilla/mozilla/webgl/tex_image_2d_mipmap.html 4b4de7a92a4ad4f71d2fe6f7c5609502607ffd7b
/_mozilla/mozilla/webgl/tex_image_2d_simple_ref.html 06711e6d8ba9520a7c0476d41130022d3e609160
Testing 4b4de7a92a4ad4f71d2fe6f7c5609502607ffd7b == 06711e6d8ba9520a7c0476d41130022d3e609160

  ▶ FAIL [expected PASS] /_mozilla/mozilla/webgl/tex_image_2d_abv.html
  └   → /_mozilla/mozilla/webgl/tex_image_2d_abv.html a9a5c967d45ac416acbdb47a6930a2ddf6771ff4
/_mozilla/mozilla/webgl/tex_image_2d_abv_ref.html d83355c858358b2d507f0d58d54f1efdc20e4be1
Testing a9a5c967d45ac416acbdb47a6930a2ddf6771ff4 == d83355c858358b2d507f0d58d54f1efdc20e4be1

  ▶ FAIL [expected PASS] /_mozilla/mozilla/webgl/clearcolor.html
  └   → /_mozilla/mozilla/webgl/clearcolor.html 2b3b81dee2e799bb62c5b337eedd6c91da918772
/_mozilla/mozilla/webgl/clearcolor_ref.html a83005ec2d5b8d21ca8536830ed9cb073c11545f
Testing 2b3b81dee2e799bb62c5b337eedd6c91da918772 == a83005ec2d5b8d21ca8536830ed9cb073c11545f
@glennw
Copy link
Member Author

glennw commented Aug 17, 2017

This is waiting on servo/webrender#1581.
@gw3583
Update WR (new texture cache allocator, shader deinit path).
Loading status checks…
26083b1
@glennw glennw force-pushed the glennw:update-wr-deinit branch from 3877fab to 26083b1 Aug 17, 2017
@glennw
Copy link
Member Author

glennw commented Aug 17, 2017

This should in theory be ready to go now...
@glennw
Copy link
Member Author

glennw commented Aug 17, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

⌛ Trying commit 26083b1 with merge 778181a...
bors-servo added a commit that referenced this pull request Aug 17, 2017
@bors-servo
Auto merge of #18096 - glennw:update-wr-deinit, r=<try>
Loading status checks…
778181a 
Update WR (new texture cache allocator, shader deinit path).

<!-- 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/18096)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

💔 Test failed - android
@jdm
Copy link
Member

jdm commented Aug 17, 2017

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

⌛ Trying commit 26083b1 with merge 94b0945...
bors-servo added a commit that referenced this pull request Aug 17, 2017
@bors-servo
Auto merge of #18096 - glennw:update-wr-deinit, r=<try>
Loading status checks…
94b0945 
Update WR (new texture cache allocator, shader deinit path).

<!-- 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/18096)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
State: approved= try=True
@glennw
Copy link
Member Author

glennw commented Aug 17, 2017

@bors-servo try- r=jdm
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

📌 Commit 26083b1 has been approved by jdm
@highfive highfive assigned jdm and unassigned emilio Aug 17, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

⌛ Testing commit 26083b1 with merge f6a42ed...
bors-servo added a commit that referenced this pull request Aug 17, 2017
@bors-servo
Auto merge of #18096 - glennw:update-wr-deinit, r=jdm
Loading status checks…
f6a42ed 
Update WR (new texture cache allocator, shader deinit path).

<!-- 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/18096)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 18, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing f6a42ed to master...
@bors-servo bors-servo merged commit 26083b1 into servo:master Aug 18, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Aug 18, 2017
Closed
2 of 12 tasks complete
@glennw glennw deleted the glennw:update-wr-deinit branch Aug 18, 2017
@bors-servo bors-servo mentioned this pull request Aug 18, 2017
Closed
1 of 5 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@glennw @bors-servo @jdm @emilio @highfive @cbrewster @gw3583
You can’t perform that action at this time.