diff options
3 files changed, 1 insertions, 23 deletions
diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs index 51604d3e415..c285145d994 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webglframebuffer.rs @@ -468,7 +468,7 @@ impl WebGLFramebuffer { return CompleteForRendering::Complete; } - if self.colors.iter().any(|att| att.borrow().is_none()) { + if self.colors.iter().all(|att| att.borrow().is_none()) { return CompleteForRendering::MissingColorAttachment; } diff --git a/tests/wpt/webgl/meta/conformance2/reading/read-pixels-from-rgb8-into-pbo-bug.html.ini b/tests/wpt/webgl/meta/conformance2/reading/read-pixels-from-rgb8-into-pbo-bug.html.ini deleted file mode 100644 index e241046227c..00000000000 --- a/tests/wpt/webgl/meta/conformance2/reading/read-pixels-from-rgb8-into-pbo-bug.html.ini +++ /dev/null @@ -1,7 +0,0 @@ -[read-pixels-from-rgb8-into-pbo-bug.html] - [WebGL test #2: getError expected: NO_ERROR. Was INVALID_OPERATION : Tests should complete without gl errors] - expected: FAIL - - [WebGL test #1: Expected in pixel 0: [255,0,0,255\], got: 0,0,0,0] - expected: FAIL - diff --git a/tests/wpt/webgl/meta/conformance2/rendering/framebuffer-texture-changing-base-level.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/framebuffer-texture-changing-base-level.html.ini index d2491514eec..e99f92686ba 100644 --- a/tests/wpt/webgl/meta/conformance2/rendering/framebuffer-texture-changing-base-level.html.ini +++ b/tests/wpt/webgl/meta/conformance2/rendering/framebuffer-texture-changing-base-level.html.ini @@ -8,24 +8,9 @@ [WebGL test #8: getError expected: NO_ERROR. Was INVALID_ENUM : Setup framebuffer with texture should succeed.] expected: FAIL - [WebGL test #3: getError expected: NO_ERROR. Was INVALID_OPERATION : Clearing the texture level 0 to green should succeed.] - expected: FAIL - - [WebGL test #9: getError expected: NO_ERROR. Was INVALID_OPERATION : Clearing the texture level 2 to green should succeed.] - expected: FAIL - - [WebGL test #6: getError expected: NO_ERROR. Was INVALID_OPERATION : Clearing the texture level 1 to green should succeed.] - expected: FAIL - - [WebGL test #14: should be green\nat (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - [WebGL test #13: getError expected: NO_ERROR. Was INVALID_ENUM : Drawing the texture to default framebuffer with base level 0 should succeed.] expected: FAIL [WebGL test #2: getError expected: NO_ERROR. Was INVALID_ENUM : Setup framebuffer with texture should succeed.] expected: FAIL - [WebGL test #12: getError expected: NO_ERROR. Was INVALID_OPERATION : Clearing the texture level 3 to green should succeed.] - expected: FAIL - |