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

Properly support gl_PointSize and gl_PointCoord #21961

Merged
merged 1 commit into from Oct 18, 2018
Merged

Properly support gl_PointSize and gl_PointCoord #21961

merged 1 commit into from Oct 18, 2018

Conversation

nox
Copy link
Contributor

@nox nox commented Oct 16, 2018 •
edited

Fixes #21719.
Fixes #20993.
Fixes #20992.
Fixes #21007.
Fixes #20979.

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webgl_extensions/ext/oesstandardderivatives.rs, components/script/dom/webgl_extensions/ext/oeselementindexuint.rs, components/script/dom/webglrenderingcontext.rs, components/script/dom/webglrenderbuffer.rs, components/script/dom/webgl_extensions/ext/extshadertexturelod.rs
  • @jgraham: tests/wpt/webgl/meta/conformance/rendering/point-size.html.ini
  • @KiChjang: components/script/dom/webgl_extensions/ext/oesstandardderivatives.rs, components/script/dom/webgl_extensions/ext/oeselementindexuint.rs, components/script/dom/webglrenderingcontext.rs, components/script/dom/webglrenderbuffer.rs, components/script/dom/webgl_extensions/ext/extshadertexturelod.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Oct 16, 2018
jdm
jdm approved these changes Oct 16, 2018
View reviewed changes
components/canvas/canvas_data.rs Outdated
@@ -99,7 +99,7 @@ impl<'a> CanvasData<'a> {
}

pub fn fill_text(&self, text: String, x: f64, y: f64, max_width: Option<f64>) {
error!("Unimplemented canvas2d.fillText. Values received: {}, {}, {}, {:?}.", text, x, y, max_width);
// error!("Unimplemented canvas2d.fillText. Values received: {}, {}, {}, {:?}.", text, x, y, max_width);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert this, please?

@nox
Copy link
Contributor Author

nox commented Oct 16, 2018

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

📌 Commit dfc11b0 has been approved by jdm

@highfive highfive assigned jdm and unassigned avadacatavra Oct 16, 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 Oct 16, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit dfc11b0 with merge b920aa2...

bors-servo pushed a commit that referenced this pull request Oct 16, 2018
Auto merge of #21961 - servo:webgl, r=jdm
b920aa2 
Properly support glPointSize

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

💔 Test failed - linux-rel-css

@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 Oct 16, 2018
@nox
Copy link
Contributor Author

nox commented Oct 16, 2018

This didn't fail on macOS, ugh.

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

nox commented Oct 17, 2018

@jdm This is very ugly but it works, do you r+?

@nox nox changed the title Properly support glPointSize Properly support gl_PointSize and gl_PointCoord Oct 17, 2018
@nox
Copy link
Contributor Author

nox commented Oct 17, 2018

Note that this fixes all the things.

@nox
Copy link
Contributor Author

nox commented Oct 17, 2018

@bors-servo try=wpt

@bors-servo
Copy link
Contributor

⌛ Trying commit 55742c2 with merge b38185f...

bors-servo pushed a commit that referenced this pull request Oct 17, 2018
Auto merge of #21961 - servo:webgl, r=<try>
b38185f 
Properly support gl_PointSize and gl_PointCoord

Fixes #21719.
Fixes #20993.
Fixes #20992.
Fixes #21007.
Fixes #20979.

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

💔 Test failed - linux-rel-css

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

nox commented Oct 17, 2018

Oh, try=wpt only tries on Linux…

@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 Oct 18, 2018
@nox nox mentioned this pull request Oct 18, 2018
Merged
@nox
Copy link
Contributor Author

nox commented Oct 18, 2018

@bors-servo retry

The intermittent failure tracking tool intermittently failed.

bors-servo pushed a commit that referenced this pull request Oct 18, 2018
Auto merge of #21961 - servo:webgl, r=jdm
8748158 
Properly support gl_PointSize and gl_PointCoord

Fixes #21719.
Fixes #20993.
Fixes #20992.
Fixes #21007.
Fixes #20979.

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

⌛ Testing commit 72c6b19 with merge 8748158...

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Oct 18, 2018
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@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 Oct 18, 2018
@ferjm
Copy link
Contributor

ferjm commented Oct 18, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

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

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-wpt

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

nox commented Oct 18, 2018

@bors-servo r=jdm

It should work better when I actually commit the expectations.

@bors-servo
Copy link
Contributor

📌 Commit 8828925 has been approved by jdm

@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 Oct 18, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 8828925 with merge bcafe41...

bors-servo pushed a commit that referenced this pull request Oct 18, 2018
Auto merge of #21961 - servo:webgl, r=jdm
bcafe41 
Properly support gl_PointSize and gl_PointCoord

Fixes #21719.
Fixes #20993.
Fixes #20992.
Fixes #21007.
Fixes #20979.

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

☀️ Test successful - android, android-mac, 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, status-taskcluster, windows-msvc-dev
Approved by: jdm
Pushing bcafe41 to master...

@bors-servo bors-servo merged commit 8828925 into master Oct 18, 2018
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Oct 18, 2018
@Manishearth
Copy link
Member

So the WebGL cloth example was broken on Oculus Go, and I bisected it to this commit. Any idea what's going on here?

(haven't yet tested it on plain Android, doing so next)

@Manishearth
Copy link
Member

On a Pixel 2 XL the commit before this (c3c6898) loads some of the cloth thing and then freezes, so I can't test this

@jdm jdm mentioned this pull request Nov 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm jdm approved these changes

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nox @highfive @bors-servo @jdm @ferjm @Manishearth @avadacatavra