Bug 1325685 - Ensure the cube attachment is complete. r=jgilbert

--HG--
extra : rebase_source : 470d4986bb6a552a56b39c6b44aabb41916acb9b

dom/canvas/WebGLFramebuffer.cpp

@@ -287,6 +287,14 @@ WebGLFBAttachPoint::IsComplete(WebGLContext* webgl, nsCString* const out_info) c
         return false;
     }
 
+    if (webgl->IsWebGL2() && Texture() &&
+        Texture()->IsCubeMap() && !Texture()->IsCubeComplete())
+    {
+        AttachmentName(out_info);
+        out_info->AppendLiteral(" is not cube complete");
+        return false;
+    }
+
     const auto format = formatUsage->format;
 
     bool hasRequiredBits;

dom/canvas/test/webgl-conf/generated-mochitest.ini

@@ -5816,8 +5816,7 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.
 [generated/test_2_conformance__textures__misc__copy-tex-sub-image-2d-partial-texture.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__textures__misc__cube-incomplete-fbo.html]
-skip-if = (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'mac')
+skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__textures__misc__default-texture.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__textures__misc__gl-pixelstorei.html]

dom/canvas/test/webgl-conf/mochitest-errata.ini

@@ -147,9 +147,6 @@ skip-if = (os == 'mac' && os_version == '10.6')
 # application crashed [@ mozilla::gl::GLContext::AfterGLCall]
 skip-if = (os == 'android') || (os == 'win')
 
-[generated/test_2_conformance__textures__misc__cube-incomplete-fbo.html]
-fail-if = (os == 'mac')
-skip-if = (os == 'win')
 [generated/test_2_conformance2__rendering__draw-buffers.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-image-with-format-and-type.html]