webgl: Validate enums for blendEquation.

Improves a conformance test that tried passing in desktop GL enums for blending.
servo · Dec 31, 2016 · daa64bf · daa64bf
1 parent b06f4ae
commit daa64bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
@@ -788,11 +788,19 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
     fn BlendEquation(&self, mode: u32) {
+        if mode != constants::FUNC_ADD {
+            return self.webgl_error(InvalidEnum);
+        }
+
         self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::BlendEquation(mode))).unwrap();
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
     fn BlendEquationSeparate(&self, mode_rgb: u32, mode_alpha: u32) {
+        if mode_rgb != constants::FUNC_ADD || mode_alpha != constants::FUNC_ADD {
+            return self.webgl_error(InvalidEnum);
+        }
+
         self.ipc_renderer
             .send(CanvasMsg::WebGL(WebGLCommand::BlendEquationSeparate(mode_rgb, mode_alpha)))
             .unwrap();

diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-enum-tests.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-enum-tests.html.ini
@@ -1,24 +1,6 @@
 [gl-enum-tests.html]
   type: testharness
   expected: ERROR
-  [WebGL test #3: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquation(desktopGL['MIN'\]) should return INVALID_ENUM.]
-    expected: FAIL
-
-  [WebGL test #4: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquation(desktopGL['MAX'\]) should return INVALID_ENUM.]
-    expected: FAIL
-
-  [WebGL test #5: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquationSeparate(desktopGL['MIN'\], gl.FUNC_ADD) should return INVALID_ENUM.]
-    expected: FAIL
-
-  [WebGL test #6: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquationSeparate(desktopGL['MAX'\], gl.FUNC_ADD) should return INVALID_ENUM.]
-    expected: FAIL
-
-  [WebGL test #7: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquationSeparate(gl.FUNC_ADD, desktopGL['MIN'\]) should return INVALID_ENUM.]
-    expected: FAIL
-
-  [WebGL test #8: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquationSeparate(gl.FUNC_ADD, desktopGL['MAX'\]) should return INVALID_ENUM.]
-    expected: FAIL
-
   [WebGL test #9: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL