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

Properly check limit in gl.activeTexture() #21341

Merged
merged 1 commit into from Aug 23, 2018
Merged

Properly check limit in gl.activeTexture() #21341

merged 1 commit into from Aug 23, 2018

Conversation

@nox
Copy link
Member

nox commented Aug 3, 2018 •
edited by jdm

Fixes #20531.

This change is Reviewable
@highfive
Copy link

highfive commented Aug 3, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/webgl_validations/tex_image_2d.rs
  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webgl_validations/tex_image_2d.rs
@highfive
Copy link

highfive commented Aug 3, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm
jdm requested changes Aug 3, 2018
View changes
Copy link
Member

jdm left a comment

I haven't looked at the rest of the changes, but this stuck out to me.
components/canvas/webgl_thread.rs Outdated
@@ -97,11 +98,20 @@ impl<VR: WebVRRenderHandler + 'static, OB: WebGLThreadObserver> WebGLThread<VR,
.expect("WebGLContext not found");
let glsl_version = Self::get_glsl_version(ctx);

let mut max_combined_texture_image_units = [0];
unsafe {
ctx.gl().get_integer_v(

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Aug 3, 2018

Member

This duplicates https://github.com/servo/rust-offscreen-rendering-context/blob/master/src/gl_limits.rs#L86.
components/canvas_traits/webgl.rs Outdated
pub glsl_version: WebGLSLVersion
pub glsl_version: WebGLSLVersion,
/// The maximum number of combined texture image units.
pub max_combined_texture_image_units: u32,

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Aug 3, 2018

Member

This duplicates https://github.com/servo/rust-offscreen-rendering-context/blob/master/src/gl_limits.rs#L11.
@nox nox force-pushed the webgl branch from 9ae8e42 to ecced3b Aug 4, 2018
@avadacatavra
avadacatavra requested changes Aug 23, 2018
View changes
Copy link
Contributor

avadacatavra left a comment

lgtm
components/canvas/webgl_thread.rs Outdated
@@ -87,6 +87,7 @@ impl<VR: WebVRRenderHandler + 'static, OB: WebGLThreadObserver> WebGLThread<VR,
}

/// Handles a generic WebGLMsg message
#[allow(unsafe_code)]

This comment has been minimized.

Sign in to view
Copy link
@avadacatavra

avadacatavra Aug 23, 2018

Contributor

I don't think this is needed

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Aug 23, 2018

Author Member

Good catch. I removed it.
@nox
Properly check limit in gl.activeTexture()
Loading status checks…
8b1c753
@nox nox force-pushed the webgl branch from ecced3b to 8b1c753 Aug 23, 2018
@avadacatavra
Copy link
Contributor

avadacatavra commented Aug 23, 2018

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

bors-servo commented Aug 23, 2018

📌 Commit 8b1c753 has been approved by avadacatavra
@highfive highfive assigned avadacatavra and unassigned Manishearth Aug 23, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 2018

⌛ Testing commit 8b1c753 with merge a1abdde...
bors-servo added a commit that referenced this pull request Aug 23, 2018
@bors-servo
Auto merge of #21341 - servo:webgl, r=avadacatavra
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…
a1abdde 
Properly check limit in gl.activeTexture()

Fixes #20531.

<!-- 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/21341)
<!-- Reviewable:end -->
@avadacatavra
avadacatavra approved these changes Aug 23, 2018
View changes
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 2018

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented Aug 23, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 2018

⚡ Previous build results for android, android-x86, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt, mac-rel-css1...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 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: avadacatavra
Pushing a1abdde to master...
@bors-servo bors-servo merged commit 8b1c753 into master Aug 23, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@jdm jdm mentioned this pull request Sep 21, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

@avadacatavra avadacatavra

Assignees

@avadacatavra avadacatavra

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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