Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Properly clamp arguments to WebGLRenderingContext.depthRange

Browse source
This commit is contained in:
Anthony Ramine 2018-04-04 17:14:53 +02:00
parent 7b4d66b621
commit fb290e9c9e
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/canvas/webgl_thread.rs
View file

@ -695,8 +695,9 @@ impl WebGLImpl {
ctx.gl().depth_func(func), ctx.gl().depth_func(func),
WebGLCommand::DepthMask(flag) => WebGLCommand::DepthMask(flag) =>
ctx.gl().depth_mask(flag), ctx.gl().depth_mask(flag),
WebGLCommand::DepthRange(near, far) => WebGLCommand::DepthRange(near, far) => {
ctx.gl().depth_range(near, far), ctx.gl().depth_range(near.max(0.).min(1.) as f64, far.max(0.).min(1.) as f64)
}
WebGLCommand::Disable(cap) => WebGLCommand::Disable(cap) =>
ctx.gl().disable(cap), ctx.gl().disable(cap),
WebGLCommand::Enable(cap) => WebGLCommand::Enable(cap) =>

2
components/canvas_traits/webgl.rs
View file

@ -177,7 +177,7 @@ pub enum WebGLCommand {
FrontFace(u32), FrontFace(u32),
DepthFunc(u32), DepthFunc(u32),
DepthMask(bool), DepthMask(bool),
DepthRange(f64, f64), DepthRange(f32, f32),
Enable(u32), Enable(u32),
Disable(u32), Disable(u32),
CompileShader(WebGLShaderId, String), CompileShader(WebGLShaderId, String),

9
components/script/dom/webglrenderingcontext.rs
View file

@ -1925,16 +1925,11 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
fn DepthRange(&self, near: f32, far: f32) { fn DepthRange(&self, near: f32, far: f32) {
// From the WebGL 1.0 spec, 6.12: Viewport Depth Range: // https://www.khronos.org/registry/webgl/specs/latest/1.0/#VIEWPORT_DEPTH_RANGE
//
// "A call to depthRange will generate an
// INVALID_OPERATION error if zNear is greater than
// zFar."
if near > far { if near > far {
return self.webgl_error(InvalidOperation); return self.webgl_error(InvalidOperation);
} }
self.send_command(WebGLCommand::DepthRange(near, far))
self.send_command(WebGLCommand::DepthRange(near as f64, far as f64))
} }
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3