Auto merge of #21717 - jdm:webgltmp5, r=nox

Make tests for uninitialized renderbuffers pass

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

<!-- 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/21717)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-14 18:23:49 -04:00 committed by GitHub
commit 9a9b4b2a14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 5 additions and 7 deletions

View file

@ -532,6 +532,7 @@ impl WebGLFramebuffer {
pub fn invalidate_renderbuffer(&self, rb: &WebGLRenderbuffer) { pub fn invalidate_renderbuffer(&self, rb: &WebGLRenderbuffer) {
self.with_matching_renderbuffers(rb, |_att, _| { self.with_matching_renderbuffers(rb, |_att, _| {
self.is_initialized.set(false);
self.update_status(); self.update_status();
}); });
} }

View file

@ -145,6 +145,7 @@ impl WebGLRenderbuffer {
}; };
self.internal_format.set(Some(internal_format)); self.internal_format.set(Some(internal_format));
self.is_initialized.set(false);
// FIXME: Invalidate completeness after the call // FIXME: Invalidate completeness after the call

View file

@ -1,2 +1,3 @@
[drawingbuffer-test.html] [drawingbuffer-test.html]
bug: https://github.com/servo/servo/issues/21718
expected: CRASH expected: CRASH

View file

@ -1,4 +1,5 @@
[gl-pointcoord.html] [gl-pointcoord.html]
bug: https://github.com/servo/servo/issues/21719
[WebGL test #48: pixel 48,192 should be 65,125,0\nat (48, 192) expected: 65,125,0 was 0,0,0] [WebGL test #48: pixel 48,192 should be 65,125,0\nat (48, 192) expected: 65,125,0 was 0,0,0]
expected: FAIL expected: FAIL

View file

@ -1,2 +1,2 @@
[uninitialized-test.html] [uninitialized-test.html]
disabled: https://github.com/servo/servo/issues/13710 disabled: https://github.com/servo/servo/issues/21716

View file

@ -1,2 +0,0 @@
[depth-renderbuffer-initialization.html]
disabled: https://github.com/servo/servo/issues/13710

View file

@ -1,2 +0,0 @@
[renderbuffer-initialization.html]
disabled: https://github.com/servo/servo/issues/13710

View file

@ -1,2 +0,0 @@
[stencil-renderbuffer-initialization.html]
disabled: https://github.com/servo/servo/issues/13710