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

Properly support gl_PointSize and gl_PointCoord #21961

Merged
merged 1 commit into from Oct 18, 2018

Conversation

Projects
None yet
7 participants
@nox
Member

nox commented Oct 16, 2018

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

This change is Reviewable

@highfive

This comment has been minimized.

highfive commented Oct 16, 2018

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
@jdm

jdm approved these changes Oct 16, 2018

@@ -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);

This comment has been minimized.

@jdm

jdm Oct 16, 2018

Member

Revert this, please?

@nox nox force-pushed the webgl branch from 0e91c67 to dfc11b0 Oct 16, 2018

@nox

This comment has been minimized.

Member

nox commented Oct 16, 2018

@bors-servo r=jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 16, 2018

📌 Commit dfc11b0 has been approved by jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 16, 2018

⌛️ Testing commit dfc11b0 with merge b920aa2...

bors-servo added a commit that referenced this pull request Oct 16, 2018

Auto merge of #21961 - servo:webgl, r=jdm
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

This comment has been minimized.

Contributor

bors-servo commented Oct 16, 2018

💔 Test failed - linux-rel-css

@nox

This comment has been minimized.

Member

nox commented Oct 16, 2018

This didn't fail on macOS, ugh.

@nox

This comment has been minimized.

Member

nox commented Oct 17, 2018

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

@nox nox force-pushed the webgl branch from 0228317 to 55742c2 Oct 17, 2018

@nox nox changed the title from Properly support glPointSize to Properly support gl_PointSize and gl_PointCoord Oct 17, 2018

@nox

This comment has been minimized.

Member

nox commented Oct 17, 2018

Note that this fixes all the things.

@nox

This comment has been minimized.

Member

nox commented Oct 17, 2018

@bors-servo try=wpt

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 17, 2018

⌛️ Trying commit 55742c2 with merge b38185f...

bors-servo added a commit that referenced this pull request Oct 17, 2018

Auto merge of #21961 - servo:webgl, r=<try>
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

This comment has been minimized.

Contributor

bors-servo commented Oct 17, 2018

💔 Test failed - linux-rel-css

@nox

This comment has been minimized.

Member

nox commented Oct 17, 2018

Oh, try=wpt only tries on Linux…

@nox

This comment has been minimized.

Member

nox commented Oct 18, 2018

@bors-servo retry

The intermittent failure tracking tool intermittently failed.

bors-servo added a commit that referenced this pull request Oct 18, 2018

Auto merge of #21961 - servo:webgl, r=jdm
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

This comment has been minimized.

Contributor

bors-servo commented Oct 18, 2018

⌛️ Testing commit 72c6b19 with merge 8748158...

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 18, 2018

💔 Test failed - linux-rel-css

@ferjm

This comment has been minimized.

Member

ferjm commented Oct 18, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 18, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 18, 2018

💔 Test failed - linux-rel-wpt

@nox

This comment has been minimized.

Member

nox commented Oct 18, 2018

@bors-servo r=jdm

It should work better when I actually commit the expectations.

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 18, 2018

📌 Commit 8828925 has been approved by jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Oct 18, 2018

⌛️ Testing commit 8828925 with merge bcafe41...

bors-servo added a commit that referenced this pull request Oct 18, 2018

Auto merge of #21961 - servo:webgl, r=jdm
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

This comment has been minimized.

@bors-servo bors-servo merged commit 8828925 into master Oct 18, 2018

2 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Manishearth

This comment has been minimized.

Member

Manishearth commented Nov 2, 2018

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

This comment has been minimized.

Member

Manishearth commented Nov 2, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment