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

Implement instanced WebGL drawing calls (part of #20791) #21129

Merged
merged 10 commits into from Jul 8, 2018
Merged

Implement instanced WebGL drawing calls (part of #20791) #21129

merged 10 commits into from Jul 8, 2018

Conversation

@nox
Copy link
Member

nox commented Jul 6, 2018 •
edited by SimonSapin

This is half of #20599. The check for drawElements is a bit more complex to implement.

This change is Reviewable
@highfive
Copy link

highfive commented Jul 6, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs
  • @KiChjang: components/script/dom/webglrenderingcontext.rs
@nox
Copy link
Member Author

nox commented Jul 6, 2018

r? @emilio
@bors-servo try
@highfive highfive assigned emilio and unassigned avadacatavra Jul 6, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2018

⌛ Trying commit c41bf6f with merge 13b64fb...
bors-servo added a commit that referenced this pull request Jul 6, 2018
@bors-servo
Auto merge of #21129 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
13b64fb 
Correctly implement the vertex buffer checks in drawArrays

This is half of #20599. The check for drawElements is a bit more complex to implement.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2018

☀️ 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
@Manishearth
Manishearth approved these changes Jul 6, 2018
View changes
Copy link
Member

Manishearth left a comment

code looks good but I don't quite understand the context here, may need a sanity check from emilio
@nox nox force-pushed the webgl branch 3 times, most recently from 97f7fc1 to 578d3f2 Jul 6, 2018
@nox nox changed the title Correctly implement the vertex buffer checks in drawArrays Implement instanced WebGL drawing calls (part of #20791) Jul 7, 2018
@nox
Copy link
Member Author

nox commented Jul 7, 2018

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

bors-servo commented Jul 7, 2018

⌛ Trying commit 578d3f2 with merge 0ecfaa4...
bors-servo added a commit that referenced this pull request Jul 7, 2018
@bors-servo
Auto merge of #21129 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0ecfaa4 
Implement instanced WebGL drawing calls (part of #20791)

This is half of #20599. The check for drawElements is a bit more complex to implement.

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

bors-servo commented Jul 7, 2018

💔 Test failed - mac-rel-wpt3
@nox nox force-pushed the webgl branch from 578d3f2 to 3f2ed5e Jul 7, 2018
@highfive highfive removed the S-tests-failed label Jul 7, 2018
@nox
Copy link
Member Author

nox commented Jul 7, 2018

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

bors-servo commented Jul 7, 2018

⌛ Trying commit 3f2ed5e with merge 47828c5...
bors-servo added a commit that referenced this pull request Jul 7, 2018
@bors-servo
Auto merge of #21129 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
47828c5 
Implement instanced WebGL drawing calls (part of #20791)

This is half of #20599. The check for drawElements is a bit more complex to implement.

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

bors-servo commented Jul 7, 2018

💔 Test failed - linux-rel-css
@nox nox force-pushed the webgl branch from 3f2ed5e to aa2aaad Jul 7, 2018
@highfive highfive removed the S-tests-failed label Jul 7, 2018
@nox
Copy link
Member Author

nox commented Jul 7, 2018

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

bors-servo commented Jul 7, 2018

⌛ Trying commit aa2aaad with merge bf197c8...
nox added 10 commits Jul 6, 2018
@nox
Fix some outdated expectations
83aaf9a
@nox
Pass more GL limits to the ANGLE shader compiler
0e93f06
@nox
Fix gl.getShaderSource and gl.getShaderInfoLog
6996d1c 
It only returns null if there was an error, and the only error isn't
implemented yet.
@nox
Reenable .../ogles/GL/build/* (fixes #13165)
7dd3efd 
gl.getProgramInfoLog was implemented a while back.
@nox
Enable some tests marked as flaky
5aafb50 
They don't seem flaky anymore and we have a tool to properly keep intermittent
results anyway now.
@nox
Return typed arrays from gl.getParameter (fixes #20655)
0e6bec6
@nox
Implement gl.getParameter(gl.MAX_VIEWPORT_DIMS)
31774e9
@nox
Return an empty typed array from gl.getParameter(gl.COMPRESSED_TEXTUR…
f0ca100 
…E_FORMATS)
@nox
Correctly implement the vertex buffer checks in drawArrays
0aefffc 
This is half of #20599. The check for drawElements is a bit more complex
to implement.
@nox
Implement instanced WebGL drawing calls (part of #20791)
Loading status checks…
4e6eea2
@nox nox force-pushed the webgl branch from 42e9a63 to 4e6eea2 Jul 8, 2018
@nox
Copy link
Member Author

nox commented Jul 8, 2018

@bors-servo r=emilio
@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2018

📌 Commit 4e6eea2 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2018

⌛ Testing commit 4e6eea2 with merge 41e1057...
bors-servo added a commit that referenced this pull request Jul 8, 2018
@bors-servo
Auto merge of #21129 - servo:webgl, r=emilio
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
41e1057 
Implement instanced WebGL drawing calls (part of #20791)

This is half of #20599. The check for drawElements is a bit more complex to implement.

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

bors-servo commented Jul 8, 2018

💔 Test failed - linux-rel-wpt
@nox
Copy link
Member Author

nox commented Jul 8, 2018

@bors-servo retry #21067 #20734
@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2018

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

bors-servo commented Jul 8, 2018

☀️ 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 41e1057 to master...
@bors-servo bors-servo merged commit 4e6eea2 into master Jul 8, 2018
3 of 5 checks passed
3 of 5 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
Tidelift Failed dependency checks
Details
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 Jul 8, 2018
Closed
3 of 5 tasks complete
@nox nox mentioned this pull request Jul 9, 2018
Open
1 of 7 tasks complete
@atouchet atouchet mentioned this pull request Jul 9, 2018
Closed
@atouchet atouchet added this to Done in WebGL content Nov 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

@Manishearth Manishearth

Assignees

@emilio emilio

Labels
S-tests-failed
Projects
WebGL content
  
Done
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@nox @highfive @bors-servo @CYBAI @emilio @Manishearth @avadacatavra
You can’t perform that action at this time.