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

Revert "Auto merge of #17891 - MortimerGoro:webgl_move, r=glennw,emilio" #18114

Merged
merged 1 commit into from Aug 16, 2017

Conversation

@emilio
Copy link
Member

emilio commented Aug 16, 2017

This reverts commit 90f55ea, reversing
changes made to 2e60b27.

Doing that per Josh's request, since it's causing very frequent intermittent OOMs on the android builders.


This change is Reviewable

This reverts commit 90f55ea, reversing
changes made to 2e60b27.
@highfive
Copy link

highfive commented Aug 16, 2017

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/pipeline.rs, components/constellation/lib.rs, components/constellation/Cargo.toml, components/constellation/constellation.rs
  • @fitzgen: components/script/dom/webglframebuffer.rs, components/script/dom/webglshader.rs, components/script/dom/webgl_validations/tex_image_2d.rs, components/script/dom/htmlcanvaselement.rs, components/script/dom/window.rs and 24 more
  • @KiChjang: components/script/dom/webglframebuffer.rs, components/script/dom/webglshader.rs, components/script/dom/webgl_validations/tex_image_2d.rs, components/script/dom/htmlcanvaselement.rs, components/script/dom/window.rs and 24 more
@highfive
Copy link

highfive commented Aug 16, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify gfx, layout, and script code, but no tests are modified. Please consider adding a test!
@emilio
Copy link
Member Author

emilio commented Aug 16, 2017

cc @MortimerGoro, sorry :(

r? @nox

@nox
Copy link
Member

nox commented Aug 16, 2017

RIP

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

📌 Commit cfe22e3 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

Testing commit cfe22e3 with merge 4d10d39...

bors-servo added a commit that referenced this pull request Aug 16, 2017
Revert "Auto merge of #17891 - MortimerGoro:webgl_move, r=glennw,emilio"

This reverts commit 90f55ea, reversing
changes made to 2e60b27.

Doing that per Josh's request, since it's causing very frequent intermittent OOMs on the android builders.

<!-- 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/18114)
<!-- Reviewable:end -->
@MortimerGoro
Copy link
Contributor

MortimerGoro commented Aug 16, 2017

Doing that per Josh's request, since it's causing very frequent intermittent OOMs on the android builders.

Wow, what could cause that? any ideas?

@MortimerGoro
Copy link
Contributor

MortimerGoro commented Aug 16, 2017

@jdm what's the best way to try a lot compilations with the android builders in a new PR? Is there any bors-servo command to test compilations only on android builders?

I never had that OOM in my local rust compilations. I can try to remove a template parameter from the WebGL thread or the webrender dependency in canvas (just needs a small change in WR). It's the only reasons which I think could cause that kind compilation of error. The other code is normal.

@jdm
Copy link
Member

jdm commented Aug 16, 2017

@MortimerGoro It's probably most useful to add your ssh key to https://github.com/servo/saltfs/tree/master/admin/files/ssh and try building directly on the android builder.

@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

@bors-servo bors-servo merged commit cfe22e3 into servo:master Aug 16, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Aug 16, 2017

@edunham Can we upgrade all the linux cross builders to something with > 8GB of RAM (at least 16 GB)?

@jdm
Copy link
Member

jdm commented Aug 16, 2017

We continue to have memory errors after reverting this PR; my apologies for assigning the blame incorrectly. You are welcome to re-merge these changes.

nox added a commit that referenced this pull request Aug 16, 2017
This reverts commit 4d10d39, reversing
changes made to ee94e2b.
@MortimerGoro MortimerGoro mentioned this pull request Aug 16, 2017
3 of 5 tasks complete
@MortimerGoro
Copy link
Contributor

MortimerGoro commented Aug 16, 2017

@jdm no problem, I created a new PR to re-merge the WebGL redesign ;) #18119

@MortimerGoro
Copy link
Contributor

MortimerGoro commented Aug 16, 2017

Closed the new PR, I didn't see that @nox had already created it

bors-servo added a commit that referenced this pull request Aug 17, 2017
Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox"

This reverts commit 4d10d39, reversing
changes made to ee94e2b.

<!-- 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/18118)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Aug 17, 2017
Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox"

This reverts commit 4d10d39, reversing
changes made to ee94e2b.

<!-- 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/18118)
<!-- Reviewable:end -->
joone pushed a commit to joone/servo that referenced this pull request Aug 21, 2017
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

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