Switch from servo/angle to the mozangle crate #20216

SimonSapin · 2018-03-06T16:22:04Z

https://github.com/servo/mozangle

This change is

highfive · 2018-03-06T16:22:08Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/Cargo.toml, components/script/dom/webglshader.rs, components/script/lib.rs
@fitzgen: components/script/Cargo.toml, components/script/dom/webglshader.rs, components/script/lib.rs
@KiChjang: components/script/Cargo.toml, components/script/dom/webglshader.rs, components/script/lib.rs

highfive · 2018-03-06T16:22:10Z

Warning

These commits modify script code, but no tests are modified. Please consider adding a test!

emilio · 2018-03-06T16:24:58Z

@bors-servo r+

Thanks!

bors-servo · 2018-03-06T16:24:59Z

📌 Commit aa9f2f1 has been approved by emilio

bors-servo · 2018-03-06T20:31:34Z

⌛ Testing commit aa9f2f1 with merge 9a6f217...

Switch from servo/angle to the mozangle crate https://github.com/servo/mozangle  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20216)

bors-servo · 2018-03-06T20:53:08Z

💔 Test failed - linux-dev

SimonSapin · 2018-03-06T21:33:56Z

Fixed import order.

@bors-servo r=emilio

bors-servo · 2018-03-06T21:33:57Z

📌 Commit 0ba0580 has been approved by SimonSapin

bors-servo · 2018-03-06T21:34:24Z

📌 Commit 0ba0580 has been approved by emilio

bors-servo · 2018-03-06T22:28:05Z

⌛ Testing commit 0ba0580 with merge f3fc5c8...

Switch from servo/angle to the mozangle crate https://github.com/servo/mozangle  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20216)

bors-servo · 2018-03-06T22:54:31Z

💔 Test failed - linux-rel-css

emilio

r=me, with or without that. Thanks!

emilio · 2018-03-12T08:48:30Z

components/script/dom/webglprogram.rs

+fn to_name_in_compiled_shader(s: &str) -> String {
+    map_dot_separated(s, |s, mapped| {
+        // This closure should match the behavior of the HashName function at:
+// https://github.com/servo/mozangle/blob/v0.1.4/gfx/angle/checkout/src/compiler/translator/HashNames.cpp#L56-L64


Ugh, the tidy name length lint, right? :/

Maybe move the comment to the line before fn , saying "The closure below" instead?

emilio · 2018-03-12T09:08:25Z

components/script/dom/webglprogram.rs

+// https://github.com/servo/mozangle/blob/v0.1.4/gfx/angle/checkout/src/compiler/translator/HashNames.cpp#L56-L64
+
+        const IDENTIFIER_MAX_LEN: usize = 1024;
+        if (s.len() + ANGLE_NAME_PREFIX.len()) <= IDENTIFIER_MAX_LEN {


I guess this is still not quite correct, given s here may contain indices and such, right? If we're going to avoid parsing the names completely, we can't deal with this correctly.

Actually just realized that we don't even need this. WebGL has its own cap on identifier length, see MAX_UNIFORM_AND_ATTRIBUTE_LEN.

So let's just remove this condition.

SimonSapin · 2018-03-12T13:16:14Z

@bors-servo r=emilio

bors-servo · 2018-03-12T13:16:15Z

📌 Commit 0a9ac20 has been approved by emilio

bors-servo · 2018-03-12T13:16:20Z

⌛ Testing commit 0a9ac20 with merge 503b17b...

Switch from servo/angle to the mozangle crate https://github.com/servo/mozangle  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20216)

bors-servo · 2018-03-12T13:22:29Z

💔 Test failed - linux-rel-wpt

https://github.com/servo/mozangle

SimonSapin · 2018-03-12T13:23:48Z

@bors-servo r=emilio

bors-servo · 2018-03-12T13:23:49Z

📌 Commit 67d983c has been approved by emilio

bors-servo · 2018-03-12T13:23:54Z

⌛ Testing commit 67d983c with merge 345c373...

Switch from servo/angle to the mozangle crate https://github.com/servo/mozangle  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20216)

bors-servo · 2018-03-12T14:32:31Z

☀️ 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: emilio
Pushing 345c373 to master...

highfive assigned metajack Mar 6, 2018

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 6, 2018

highfive assigned emilio and unassigned metajack Mar 6, 2018

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Mar 6, 2018

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Mar 6, 2018

SimonSapin force-pushed the mozangle branch from aa9f2f1 to 0ba0580 Compare March 6, 2018 21:33

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Mar 6, 2018

highfive assigned SimonSapin and unassigned emilio Mar 6, 2018

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Mar 6, 2018

highfive assigned emilio and unassigned SimonSapin Mar 6, 2018

emilio approved these changes Mar 12, 2018

View reviewed changes

emilio reviewed Mar 12, 2018

View reviewed changes

SimonSapin force-pushed the mozangle branch from 28abade to 0a9ac20 Compare March 12, 2018 12:53

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Mar 12, 2018

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Mar 12, 2018

Switch from servo/angle to the mozangle crate

67d983c

https://github.com/servo/mozangle

SimonSapin force-pushed the mozangle branch from 0a9ac20 to 67d983c Compare March 12, 2018 13:23

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Mar 12, 2018

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Mar 12, 2018

bors-servo merged commit 67d983c into master Mar 12, 2018

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 12, 2018

This was referenced Mar 12, 2018

Use higher level handles from JS bindings #20246

Merged

Fix JS object conversion in unions #20265

Merged

Support JS typed arrays as arguments and in WebIDL unions #20267

Merged

SimonSapin deleted the mozangle branch March 12, 2018 14:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch from servo/angle to the mozangle crate #20216

Switch from servo/angle to the mozangle crate #20216

SimonSapin commented Mar 6, 2018 •

edited

highfive commented Mar 6, 2018

highfive commented Mar 6, 2018

emilio commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

SimonSapin commented Mar 6, 2018 •

edited

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

emilio left a comment

emilio Mar 12, 2018

emilio Mar 12, 2018

emilio Mar 12, 2018

SimonSapin commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

SimonSapin commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

Switch from servo/angle to the mozangle crate #20216

Switch from servo/angle to the mozangle crate #20216

Conversation

SimonSapin commented Mar 6, 2018 • edited

highfive commented Mar 6, 2018

highfive commented Mar 6, 2018

emilio commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

SimonSapin commented Mar 6, 2018 • edited

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

bors-servo commented Mar 6, 2018

emilio left a comment

Choose a reason for hiding this comment

emilio Mar 12, 2018

Choose a reason for hiding this comment

emilio Mar 12, 2018

Choose a reason for hiding this comment

emilio Mar 12, 2018

Choose a reason for hiding this comment

SimonSapin commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

SimonSapin commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

bors-servo commented Mar 12, 2018

SimonSapin commented Mar 6, 2018 •

edited

SimonSapin commented Mar 6, 2018 •

edited