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

Validate GLSL names (fixes #21287) #21755

Merged
merged 1 commit into from Sep 20, 2018

Conversation

Projects
None yet
4 participants
@nox
Member

nox commented Sep 20, 2018

This change is Reviewable

@highfive

This comment has been minimized.

highfive commented Sep 20, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglprogram.rs
  • @jgraham: tests/wpt/webgl/meta/conformance/misc/invalid-passed-params.html.ini
  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglprogram.rs
@jdm

This comment has been minimized.

Member

jdm commented Sep 20, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 20, 2018

📌 Commit a99eee4 has been approved by jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 20, 2018

⌛️ Testing commit a99eee4 with merge 48d93ff...

bors-servo added a commit that referenced this pull request Sep 20, 2018

Auto merge of #21755 - servo:webgl, r=jdm
Validate GLSL names (fixes #21287)

<!-- 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/21755)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 20, 2018

💔 Test failed - linux-rel-css

}
// Check if the name is reserved
if name.starts_with("gl_") {

This comment has been minimized.

@nox

nox Sep 20, 2018

Member

Imma casually remove checks like a noob.

@nox nox force-pushed the webgl branch from 65996ac to 60c93cf Sep 20, 2018

@nox

This comment has been minimized.

Member

nox commented Sep 20, 2018

@bors-servo r=jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 20, 2018

📌 Commit 60c93cf has been approved by jdm

bors-servo added a commit that referenced this pull request Sep 20, 2018

Auto merge of #21755 - servo:webgl, r=jdm
Validate GLSL names (fixes #21287)

<!-- 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/21755)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 20, 2018

⌛️ Testing commit 60c93cf with merge ee1e11f...

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 20, 2018

@bors-servo bors-servo merged commit 60c93cf into master Sep 20, 2018

1 of 4 checks passed

Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment