diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2018-08-22 15:09:05 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2018-09-10 15:56:17 -0400 |
| commit | 690c98dda7d618d9f0a6553ca17d1dfc4a97555b (patch) | |
| tree | c0ffa49965faf9a2e49e03151deb2ae520d680f8 | |
| parent | da3b0ef88f52d61f4f94f2fa70099d42aebae061 (diff) | |
| download | servo-690c98dda7d618d9f0a6553ca17d1dfc4a97555b.tar.gz servo-690c98dda7d618d9f0a6553ca17d1dfc4a97555b.zip | |
webgl: return missing attachment status from framebuffers with no attachments.
| -rw-r--r-- | components/script/dom/webglframebuffer.rs | 4 | ||||
| -rw-r--r-- | tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs index de659e6ebd3..83814bd2f30 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webglframebuffer.rs @@ -66,7 +66,7 @@ impl WebGLFramebuffer { target: Cell::new(None), is_deleted: Cell::new(false), size: Cell::new(None), - status: Cell::new(constants::FRAMEBUFFER_UNSUPPORTED), + status: Cell::new(constants::FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT), color: DomRefCell::new(None), depth: DomRefCell::new(None), stencil: DomRefCell::new(None), @@ -206,7 +206,7 @@ impl WebGLFramebuffer { self.status.set(constants::FRAMEBUFFER_INCOMPLETE_ATTACHMENT); } } else { - self.status.set(constants::FRAMEBUFFER_UNSUPPORTED); + self.status.set(constants::FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT); } } diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini index 06d68f8e7ed..de3a2cf6273 100644 --- a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini +++ b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini @@ -2,20 +2,11 @@ [WebGL test #139: at (0, 0) expected: 0,255,0,255 was 255,0,0,255] expected: fail - [WebGL test #522: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT was FRAMEBUFFER_UNSUPPORTED or FRAMEBUFFER_UNSUPPORTED] - expected: FAIL - - [WebGL test #537: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT was FRAMEBUFFER_UNSUPPORTED or FRAMEBUFFER_UNSUPPORTED] - expected: FAIL - [WebGL test #559: getError expected: INVALID_OPERATION. Was INVALID_FRAMEBUFFER_OPERATION : After CopyTexSubImage2D from missing attachment] expected: FAIL [WebGL test #555: getError expected: INVALID_OPERATION. Was INVALID_FRAMEBUFFER_OPERATION : After ReadPixels from missing attachment] expected: FAIL - [WebGL test #519: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT was FRAMEBUFFER_UNSUPPORTED or FRAMEBUFFER_UNSUPPORTED] - expected: FAIL - [WebGL test #557: getError expected: INVALID_OPERATION. Was INVALID_FRAMEBUFFER_OPERATION : After CopyTexImage2D from missing attachment] expected: FAIL |