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

Validate GLSL names (fixes #21287) #21755

Merged
merged 1 commit into from
Sep 20, 2018
Merged

Validate GLSL names (fixes #21287) #21755

merged 1 commit into from
Sep 20, 2018

Conversation

nox
Copy link
Contributor

@nox nox commented Sep 20, 2018 •
edited by SimonSapin
Loading

This change is Reviewable

@highfive
Copy link

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

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

jdm commented Sep 20, 2018

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit a99eee4 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 Sep 20, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit a99eee4 with merge 48d93ff...

bors-servo pushed a commit that referenced this pull request Sep 20, 2018
Auto merge of #21755 - servo:webgl, r=jdm
48d93ff 
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
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 Sep 20, 2018
nox
nox commented Sep 20, 2018
View reviewed changes
components/script/dom/webglprogram.rs Outdated
}

// Check if the name is reserved
if name.starts_with("gl_") {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Imma casually remove checks like a noob.

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

nox commented Sep 20, 2018

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

📌 Commit 60c93cf 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 Sep 20, 2018
bors-servo pushed a commit that referenced this pull request Sep 20, 2018
Auto merge of #21755 - servo:webgl, r=jdm
ee1e11f 
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
Copy link
Contributor

⌛ Testing commit 60c93cf with merge ee1e11f...

@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: jdm
Pushing ee1e11f to master...

@bors-servo bors-servo merged commit 60c93cf into master Sep 20, 2018
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nox @highfive @jdm @bors-servo