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

Various webgl fixes for framebuffer attachment test #21461

Merged
merged 13 commits into from Sep 12, 2018

Conversation

Projects
None yet
5 participants
@jdm
Member

jdm commented Aug 20, 2018

These changes resolve all panics on macOS when running framebuffer-object-attachment.html in headless and headful testing.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • There are tests for these changes OR
  • Fixes #13710. Fixes #20570.

This change is Reviewable

@highfive

This comment has been minimized.

highfive commented Aug 20, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webgltexture.rs, components/script/dom/webglrenderingcontext.rs, components/script/dom/webglframebuffer.rs
  • @KiChjang: components/script/dom/webgltexture.rs, components/script/dom/webglrenderingcontext.rs, components/script/dom/webglframebuffer.rs
@jdm

This comment has been minimized.

Member

jdm commented Aug 20, 2018

r? @nox

@highfive highfive assigned nox and unassigned mbrubeck Aug 20, 2018

@nox

This comment has been minimized.

Member

nox commented Aug 20, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

📌 Commit 226a60a has been approved by nox

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

⌛️ Testing commit 226a60a with merge 86dddb3...

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

Auto merge of #21461 - jdm:webgltmp2, r=nox
Various webgl fixes for framebuffer attachment test

These changes resolve all panics on macOS when running framebuffer-object-attachment.html in headless and headful testing.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR

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

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

💔 Test failed - linux-rel-css

@jdm jdm force-pushed the jdm:webgltmp2 branch from 226a60a to 1891c10 Aug 24, 2018

@jdm

This comment has been minimized.

Member

jdm commented Aug 24, 2018

@bors-servo test-wpt

@jdm

This comment has been minimized.

Member

jdm commented Aug 24, 2018

@bors-servo try=wpt

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 24, 2018

⌛️ Trying commit 1891c10 with merge 026532e...

bors-servo added a commit that referenced this pull request Aug 24, 2018

Auto merge of #21461 - jdm:webgltmp2, r=<try>
Various webgl fixes for framebuffer attachment test

These changes resolve all panics on macOS when running framebuffer-object-attachment.html in headless and headful testing.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR

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

This comment has been minimized.

Contributor

bors-servo commented Aug 24, 2018

💔 Test failed - linux-rel-css

@jdm

This comment has been minimized.

Member

jdm commented Aug 24, 2018

Need to look at:

  • /_mozilla/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html
  • /_mozilla/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html
@@ -1091,6 +1172,63 @@ impl WebGLImpl {
assert_eq!(error, gl::NO_ERROR, "Unexpected WebGL error: 0x{:x} ({})", error, error);
}
#[allow(unsafe_code)]

This comment has been minimized.

@nox

nox Aug 29, 2018

Member

This doesn't use any unsafe code.

@@ -200,6 +200,7 @@ pub struct WebGLRenderingContext {
current_scissor: Cell<(i32, i32, i32, i32)>,
#[ignore_malloc_size_of = "Because it's small"]
current_clear_color: Cell<(f32, f32, f32, f32)>,
#[ignore_malloc_size_of = "Because it's small"]

This comment has been minimized.

@nox

nox Aug 29, 2018

Member

Why is this suddenly needed?

@jdm jdm force-pushed the jdm:webgltmp2 branch from 1891c10 to b6160c7 Aug 30, 2018

@nox

This comment has been minimized.

Member

nox commented Sep 10, 2018

The following expectations reference #13710:

  • tests/wpt/webgl/meta/conformance/misc/uninitialized-test.html.ini
  • tests/wpt/webgl/meta/conformance/renderbuffers/depth-renderbuffer-initialization.html.ini
  • tests/wpt/webgl/meta/conformance/renderbuffers/renderbuffer-initialization.html.ini
  • tests/wpt/webgl/meta/conformance/renderbuffers/stencil-renderbuffer-initialization.html.ini

AFAICT they are not all changed in your PR. Could you reenable them? Looks good to me otherwise, r=me.

@jdm

This comment has been minimized.

Member

jdm commented Sep 10, 2018

@bors-servo r=nox

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 10, 2018

📌 Commit ba25d06 has been approved by nox

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 11, 2018

⌛️ Testing commit ba25d06 with merge ffe256f...

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

Auto merge of #21461 - jdm:webgltmp2, r=nox
Various webgl fixes for framebuffer attachment test

These changes resolve all panics on macOS when running framebuffer-object-attachment.html in headless and headful testing.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR
- [x] Fixes #13710. Fixes #20570.

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

This comment has been minimized.

Contributor

bors-servo commented Sep 11, 2018

💔 Test failed - linux-rel-css

@nox

This comment has been minimized.

Member

nox commented Sep 12, 2018

@jdm Could you disable the tests about uninitialised buffers again and make this land?

@jdm jdm force-pushed the jdm:webgltmp2 branch from ba25d06 to 4edb7b1 Sep 12, 2018

@jdm

This comment has been minimized.

Member

jdm commented Sep 12, 2018

@bors-servo r=nox

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 12, 2018

📌 Commit 4edb7b1 has been approved by nox

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 12, 2018

⌛️ Testing commit 4edb7b1 with merge a438374...

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

Auto merge of #21461 - jdm:webgltmp2, r=nox
Various webgl fixes for framebuffer attachment test

These changes resolve all panics on macOS when running framebuffer-object-attachment.html in headless and headful testing.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR
- [x] Fixes #13710. Fixes #20570.

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

This comment has been minimized.

Contributor

bors-servo commented Sep 12, 2018

💔 Test failed - mac-rel-wpt2

@jdm

This comment has been minimized.

Member

jdm commented Sep 12, 2018

@bors-servo retry

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 12, 2018

⌛️ Testing commit 4edb7b1 with merge 26745b2...

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

Auto merge of #21461 - jdm:webgltmp2, r=nox
Various webgl fixes for framebuffer attachment test

These changes resolve all panics on macOS when running framebuffer-object-attachment.html in headless and headful testing.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR
- [x] Fixes #13710. Fixes #20570.

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

This comment has been minimized.

Contributor

bors-servo commented Sep 12, 2018

@bors-servo bors-servo merged commit 4edb7b1 into servo:master Sep 12, 2018

2 of 4 checks passed

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