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.

Sign up for GitHub

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

Jump to bottom

Merge code from Draw* and Draw*Instanced methods #21335

Merged
merged 1 commit into from
Aug 3, 2018
Merged

Merge code from Draw* and Draw*Instanced methods #21335

merged 1 commit into from
Aug 3, 2018

Conversation

nox
Copy link
Contributor

@nox nox commented Aug 3, 2018 •
edited by SimonSapin

This change is Reviewable

@nox
Merge code from Draw* and Draw*Instanced methods
04c81c5 
This made me realise we weren't supporting OES_element_index_uint in the
ANGLE_instanced_arrays extension.
@highfive
Copy link

highfive commented Aug 3, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs
  • @KiChjang: components/script/dom/webglrenderingcontext.rs

@highfive
Copy link

highfive commented Aug 3, 2018

warning Warning warning

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

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 3, 2018
@emilio
Copy link
Member

emilio commented Aug 3, 2018

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 04c81c5 has been approved by emilio

@highfive highfive assigned emilio and unassigned paulrouget Aug 3, 2018
@highfive 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 Aug 3, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 04c81c5 with merge 025ba5c...

bors-servo pushed a commit that referenced this pull request Aug 3, 2018
Auto merge of #21335 - servo:webgl, r=emilio
025ba5c 
Merge code from Draw* and Draw*Instanced methods

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

💔 Test failed - mac-rel-css1

@highfive 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 Aug 3, 2018
@nox
Copy link
Contributor Author

nox commented Aug 3, 2018 

{"status": "FAIL", "group": "default", "message": "assert_equals: Expected value for element id is 'box2' expected Element node <div id=\"box2\" class=\"box\"></div> but got Element node <html><head>\n<title>CSSOM View Module test:CaretPosition<...", "stack": "@http://web-platform.test:8000/css/cssom-view/CaretPosition-001.html:32:3\nTest.prototype.step@http://web-platform.test:8000/resources/testharness.js:1538:20\ntest@http://web-platform.test:8000/resources/testharness.js:545:9\n@http://web-platform.test:8000/css/cssom-view/CaretPosition-001.html:31:1\n", "subtest": "Element at (400, 100)", "test": "/css/cssom-view/CaretPosition-001.html", "line": 28619, "action": "test_result", "expected": "PASS"}
{"status": "FAIL", "group": "default", "message": "assert_equals: expected 0 but got 200", "stack": "steps<.handler@http://web-platform.test:8000/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html:20:7\nrunNextStep/listener<@http://web-platform.test:8000/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html:32:9\nTest.prototype.step@http://web-platform.test:8000/resources/testharness.js:1538:20\nTest.prototype.step_func/<@http://web-platform.test:8000/resources/testharness.js:1562:20\n", "subtest": "Fragment Navigation: TOP is a valid element id, which overrides navigating to top of the document", "test": "/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html", "line": 45266, "action": "test_result", "expected": "PASS"}

Pretty sure those are intermittent, but I want to retry before filing the issues.

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...

@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-css1

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Aug 3, 2018
@nox
Copy link
Contributor Author

nox commented Aug 3, 2018

15:09 <•jdm> I am really worried about how all of our automated tests related to hit testing and scrolling are suddenly having intermittent failures in the past couple days
15:10 <•jdm> it started 4 days ago; there's been #21283, #21295, #21312, #21321, and now nox has hit three more in a single PR today

@nox
Copy link
Contributor Author

nox commented Aug 3, 2018

@bors-servo retry #21338

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...

@bors-servo
Copy link
Contributor

☀️ Test successful - android, android-x86, 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 025ba5c to master...

@bors-servo bors-servo merged commit 04c81c5 into master Aug 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio emilio approved these changes

Assignees

@emilio emilio

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nox @highfive @emilio @bors-servo @paulrouget