diff options
| -rw-r--r-- | components/canvas/webgl_thread.rs | 11 | ||||
| -rw-r--r-- | components/canvas_traits/webgl.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/webglbuffer.rs | 8 | ||||
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 26 |
4 files changed, 16 insertions, 31 deletions
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index bba93918c70..933c8893cf2 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -758,8 +758,6 @@ impl WebGLImpl { Self::vertex_attrib(ctx.gl(), index, pname, chan), WebGLCommand::GetVertexAttribOffset(index, pname, chan) => Self::vertex_attrib_offset(ctx.gl(), index, pname, chan), - WebGLCommand::GetBufferParameter(target, param_id, chan) => - Self::buffer_parameter(ctx.gl(), target, param_id, chan), WebGLCommand::GetParameter(param_id, chan) => Self::parameter(ctx.gl(), param_id, chan), WebGLCommand::GetTexParameter(target, pname, chan) => @@ -1127,15 +1125,6 @@ impl WebGLImpl { chan.send(result).unwrap(); } - fn buffer_parameter(gl: &gl::Gl, - target: u32, - param_id: u32, - chan: WebGLSender<i32>) { - let result = gl.get_buffer_parameter_iv(target, param_id); - - chan.send(result).unwrap(); - } - fn program_parameter(gl: &gl::Gl, program_id: WebGLProgramId, param_id: u32, diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs index 1ac1156ff0d..55d2843c276 100644 --- a/components/canvas_traits/webgl.rs +++ b/components/canvas_traits/webgl.rs @@ -205,7 +205,6 @@ pub enum WebGLCommand { EnableVertexAttribArray(u32), FramebufferRenderbuffer(u32, u32, u32, Option<WebGLRenderbufferId>), FramebufferTexture2D(u32, u32, u32, Option<WebGLTextureId>, i32), - GetBufferParameter(u32, u32, WebGLSender<i32>), GetExtensions(WebGLSender<String>), GetParameter(u32, WebGLSender<WebGLResult<WebGLParameter>>), GetTexParameter(u32, u32, WebGLSender<i32>), @@ -479,7 +478,6 @@ impl fmt::Debug for WebGLCommand { EnableVertexAttribArray(..) => "EnableVertexAttribArray", FramebufferRenderbuffer(..) => "FramebufferRenderbuffer", FramebufferTexture2D(..) => "FramebufferTexture2D", - GetBufferParameter(..) => "GetBufferParameter", GetExtensions(..) => "GetExtensions", GetParameter(..) => "GetParameter", GetTexParameter(..) => "GetTexParameter", diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs index 5f00c7f45cc..bcbeecdffb7 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webglbuffer.rs @@ -30,6 +30,8 @@ pub struct WebGLBuffer { pending_delete: Cell<bool>, #[ignore_malloc_size_of = "Defined in ipc-channel"] renderer: WebGLMsgSender, + /// https://www.khronos.org/registry/OpenGL-Refpages/es2.0/xhtml/glGetBufferParameteriv.xml + usage: Cell<u32>, } impl WebGLBuffer { @@ -45,6 +47,7 @@ impl WebGLBuffer { vao_references: DomRefCell::new(None), pending_delete: Cell::new(false), renderer: renderer, + usage: Cell::new(WebGLRenderingContextConstants::STATIC_DRAW), } } @@ -105,6 +108,7 @@ impl WebGLBuffer { } let data = data.into(); self.capacity.set(data.len()); + self.usage.set(usage); self.renderer.send(WebGLCommand::BufferData(target, data.into(), usage)).unwrap(); Ok(()) @@ -158,6 +162,10 @@ impl WebGLBuffer { } } } + + pub fn usage(&self) -> u32 { + self.usage.get() + } } impl Drop for WebGLBuffer { diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index eca047d66d8..b0b91a71f77 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1250,30 +1250,20 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { target: u32, parameter: u32, ) -> JSVal { - let buffer = handle_potential_webgl_error!(self, self.bound_buffer(target), return NullValue()); + let buffer = handle_potential_webgl_error!( + self, + self.bound_buffer(target).and_then(|buf| buf.ok_or(InvalidOperation)), + return NullValue() + ); match parameter { - constants::BUFFER_SIZE | constants::BUFFER_USAGE => {}, + constants::BUFFER_SIZE => Int32Value(buffer.capacity() as i32), + constants::BUFFER_USAGE => Int32Value(buffer.usage() as i32), _ => { self.webgl_error(InvalidEnum); - return NullValue(); - } - } - let buffer = match buffer { - Some(buffer) => buffer, - None => { - self.webgl_error(InvalidOperation); - return NullValue(); + NullValue() } - }; - - if parameter == constants::BUFFER_SIZE { - return Int32Value(buffer.capacity() as i32); } - - let (sender, receiver) = webgl_channel().unwrap(); - self.send_command(WebGLCommand::GetBufferParameter(target, parameter, sender)); - Int32Value(receiver.recv().unwrap()) } #[allow(unsafe_code)] |