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

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
Member

nox commented Sep 20, 2018 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

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
Copy link
Member

jdm commented Sep 20, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 20, 2018

📌 Commit a99eee4 has been approved by jdm
@bors-servo
Copy link
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
@bors-servo
Auto merge of #21755 - servo:webgl, r=jdm
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…
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

bors-servo commented Sep 20, 2018

💔 Test failed - linux-rel-css
@nox
nox reviewed Sep 20, 2018
View changes
components/script/dom/webglprogram.rs Outdated
}

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

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Sep 20, 2018

Author Member

Imma casually remove checks like a noob.
@nox nox force-pushed the webgl branch from a99eee4 to 65996ac Sep 20, 2018
@nox
Validate GLSL names (fixes #21287)
Loading status checks…
60c93cf
@nox nox force-pushed the webgl branch from 65996ac to 60c93cf Sep 20, 2018
@nox
Copy link
Member Author

nox commented Sep 20, 2018

@bors-servo r=jdm
@bors-servo
Copy link
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
@bors-servo
Auto merge of #21755 - servo:webgl, r=jdm
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…
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

bors-servo commented Sep 20, 2018

⌛ Testing commit 60c93cf with merge ee1e11f...
@bors-servo
Copy link
Contributor

bors-servo commented Sep 20, 2018

☀️ 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
1 of 4 checks passed
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
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@nox @highfive @jdm @bors-servo
You can’t perform that action at this time.