diff options
| author | Igor Gutorov <igootorov@gmail.com> | 2018-03-20 21:08:28 +0200 |
|---|---|---|
| committer | Igor Gutorov <igootorov@gmail.com> | 2018-03-20 21:08:28 +0200 |
| commit | 0747853ad0b0d936704112691884e14d86047e9e (patch) | |
| tree | 400df39b9735cb78dd15210610417b37ec5626c5 | |
| parent | 431e3ddf8dfb68e2c5449f2f7cf49aa83be289a8 (diff) | |
| download | servo-0747853ad0b0d936704112691884e14d86047e9e.tar.gz servo-0747853ad0b0d936704112691884e14d86047e9e.zip | |
Simplify VertexAttribOffset
| -rw-r--r-- | components/canvas/webgl_thread.rs | 8 | ||||
| -rw-r--r-- | components/canvas_traits/webgl.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index e4d807b01d6..f4f90b5a629 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -1104,12 +1104,8 @@ impl WebGLImpl { fn vertex_attrib_offset(gl: &gl::Gl, index: u32, pname: u32, - chan: WebGLSender<WebGLResult<isize>>) { - let result = match pname { - gl::VERTEX_ATTRIB_ARRAY_POINTER => Ok(gl.get_vertex_attrib_pointer_v(index, pname)), - _ => Err(WebGLError::InvalidEnum), - }; - + chan: WebGLSender<isize>) { + let result = gl.get_vertex_attrib_pointer_v(index, pname); chan.send(result).unwrap(); } diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs index ac0e5a17b99..a9bfadeea17 100644 --- a/components/canvas_traits/webgl.rs +++ b/components/canvas_traits/webgl.rs @@ -216,7 +216,7 @@ pub enum WebGLCommand { GetAttribLocation(WebGLProgramId, String, WebGLSender<Option<i32>>), GetUniformLocation(WebGLProgramId, String, WebGLSender<Option<i32>>), GetVertexAttrib(u32, u32, WebGLSender<WebGLResult<WebGLParameter>>), - GetVertexAttribOffset(u32, u32, WebGLSender<WebGLResult<isize>>), + GetVertexAttribOffset(u32, u32, WebGLSender<isize>), GetShaderInfoLog(WebGLShaderId, WebGLSender<String>), GetProgramInfoLog(WebGLProgramId, WebGLSender<String>), PolygonOffset(f32, f32), diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index c6443ecfd29..8373f39da0a 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -2421,10 +2421,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 fn GetVertexAttribOffset(&self, index: u32, pname: u32) -> i64 { + if pname != constants::VERTEX_ATTRIB_ARRAY_POINTER { + self.webgl_error(InvalidEnum); + return 0; + } let (sender, receiver) = webgl_channel().unwrap(); self.send_command(WebGLCommand::GetVertexAttribOffset(index, pname, sender)); - handle_potential_webgl_error!(self, receiver.recv().unwrap(), 0) as i64 + receiver.recv().unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 |