aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2016-08-09 23:23:42 -0700
committerEric Anholt <eric@anholt.net>2016-08-10 00:05:02 -0700
commit12a96caaf19e39611d8f1fff96d9925ca9e134f8 (patch)
tree248db29bd16d9970b4ef2b67eb6c6239fc130d48 /components/script
parent944cbbff8ba75b0fc493222923137be35c701aca (diff)
downloadservo-12a96caaf19e39611d8f1fff96d9925ca9e134f8.tar.gz
servo-12a96caaf19e39611d8f1fff96d9925ca9e134f8.zip
webgl: Validate that depthRange near <= far.
Fixes a subtest of webgl-specific.html.
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/webglrenderingcontext.rs9
1 files changed, 9 insertions, 0 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index dbb774ad87b..a7418921e8a 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -987,6 +987,15 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
fn DepthRange(&self, near: f32, far: f32) {
+ // From the WebGL 1.0 spec, 6.12: Viewport Depth Range:
+ //
+ // "A call to depthRange will generate an
+ // INVALID_OPERATION error if zNear is greater than
+ // zFar."
+ if near > far {
+ return self.webgl_error(InvalidOperation);
+ }
+
self.ipc_renderer
.send(CanvasMsg::WebGL(WebGLCommand::DepthRange(near as f64, far as f64)))
.unwrap()