diff options
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 448 |
1 files changed, 178 insertions, 270 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 20fe133e02c..c45362b4fe2 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -3,7 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt}; -use canvas_traits::{CanvasCommonMsg, CanvasMsg, byte_swap, multiply_u8_pixel}; +use canvas_traits::canvas::{byte_swap, multiply_u8_pixel}; +use canvas_traits::webgl::{WebGLContextShareMode, WebGLCommand, WebGLError}; +use canvas_traits::webgl::{WebGLFramebufferBindingRequest, WebGLMsg, WebGLMsgSender, WebGLParameter, WebVRCommand}; +use canvas_traits::webgl::WebGLError::*; +use canvas_traits::webgl::webgl_channel; use core::cell::Ref; use core::iter::FromIterator; use core::nonzero::NonZero; @@ -19,7 +23,6 @@ use dom::bindings::js::{JS, LayoutJS, MutNullableJS, Root}; use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; use dom::bindings::str::DOMString; use dom::event::{Event, EventBubbles, EventCancelable}; -use dom::globalscope::GlobalScope; use dom::htmlcanvaselement::HTMLCanvasElement; use dom::htmlcanvaselement::utils as canvas_utils; use dom::node::{Node, NodeDamage, window_from_node}; @@ -42,7 +45,6 @@ use dom::window::Window; use dom_struct::dom_struct; use euclid::Size2D; use half::f16; -use ipc_channel::ipc::{self, IpcSender}; use js::conversions::ConversionBehavior; use js::jsapi::{JSContext, JSObject, Type, Rooted}; use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue, UndefinedValue}; @@ -50,13 +52,11 @@ use js::typedarray::{TypedArray, TypedArrayElement, Float32, Int32}; use net_traits::image::base::PixelFormat; use net_traits::image_cache::ImageResponse; use offscreen_gl_context::{GLContextAttributes, GLLimits}; -use script_traits::ScriptMsg; +use script_layout_interface::HTMLCanvasDataSource; use servo_config::prefs::PREFS; use std::cell::Cell; use std::collections::HashMap; use webrender_api; -use webrender_api::{WebGLCommand, WebGLError, WebGLFramebufferBindingRequest, WebGLParameter}; -use webrender_api::WebGLError::*; type ImagePixelResult = Result<(Vec<u8>, Size2D<i32>, bool), ()>; pub const MAX_UNIFORM_AND_ATTRIBUTE_LEN: usize = 256; @@ -92,9 +92,7 @@ macro_rules! handle_object_deletion { } if let Some(command) = $unbind_command { - $self_.ipc_renderer - .send(CanvasMsg::WebGL(command)) - .unwrap(); + $self_.send_command(command); } } }; @@ -135,12 +133,15 @@ bitflags! { #[dom_struct] pub struct WebGLRenderingContext { reflector_: Reflector, - #[ignore_heap_size_of = "Defined in ipc-channel"] - ipc_renderer: IpcSender<CanvasMsg>, + #[ignore_heap_size_of = "Channels are hard"] + webgl_sender: WebGLMsgSender, + #[ignore_heap_size_of = "Defined in webrender"] + webrender_image: Cell<Option<webrender_api::ImageKey>>, + share_mode: WebGLContextShareMode, #[ignore_heap_size_of = "Defined in offscreen_gl_context"] limits: GLLimits, canvas: JS<HTMLCanvasElement>, - #[ignore_heap_size_of = "Defined in webrender_api"] + #[ignore_heap_size_of = "Defined in canvas_traits"] last_error: Cell<Option<WebGLError>>, texture_unpacking_settings: Cell<TextureUnpacking>, texture_unpacking_alignment: Cell<u32>, @@ -158,7 +159,7 @@ pub struct WebGLRenderingContext { current_scissor: Cell<(i32, i32, i32, i32)>, #[ignore_heap_size_of = "Because it's small"] current_clear_color: Cell<(f32, f32, f32, f32)>, - extension_manager: WebGLExtensions + extension_manager: WebGLExtensions, } impl WebGLRenderingContext { @@ -171,17 +172,19 @@ impl WebGLRenderingContext { return Err("WebGL context creation error forced by pref `webgl.testing.context_creation_error`".into()); } - let (sender, receiver) = ipc::channel().unwrap(); - let script_to_constellation_chan = window.upcast::<GlobalScope>().script_to_constellation_chan(); - script_to_constellation_chan.send(ScriptMsg::CreateWebGLPaintThread(size, attrs, sender)) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + let webgl_chan = window.webgl_chan(); + webgl_chan.send(WebGLMsg::CreateContext(size, attrs, sender)) + .unwrap(); let result = receiver.recv().unwrap(); - result.map(|(ipc_renderer, context_limits)| { + result.map(|ctx_data| { WebGLRenderingContext { reflector_: Reflector::new(), - ipc_renderer: ipc_renderer, - limits: context_limits, + webgl_sender: ctx_data.sender, + webrender_image: Cell::new(None), + share_mode: ctx_data.share_mode, + limits: ctx_data.limits, canvas: JS::from_ref(canvas), last_error: Cell::new(None), texture_unpacking_settings: Cell::new(CONVERT_COLORSPACE), @@ -253,31 +256,43 @@ impl WebGLRenderingContext { } pub fn recreate(&self, size: Size2D<i32>) { - self.ipc_renderer.send(CanvasMsg::Common(CanvasCommonMsg::Recreate(size))).unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.webgl_sender.send_resize(size, sender).unwrap(); + + if let Err(msg) = receiver.recv().unwrap() { + error!("Error resizing WebGLContext: {}", msg); + return; + }; + + // Reset webrender_image because resize creates a new image_key. + // The new image key is set in the next handle_layout() method. + self.webrender_image.set(None); // ClearColor needs to be restored because after a resize the GLContext is recreated // and the framebuffer is cleared using the default black transparent color. let color = self.current_clear_color.get(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::ClearColor(color.0, color.1, color.2, color.3))) - .unwrap(); + self.send_command(WebGLCommand::ClearColor(color.0, color.1, color.2, color.3)); // WebGL Spec: Scissor rect must not change if the canvas is resized. // See: webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html // NativeContext handling library changes the scissor after a resize, so we need to reset the // default scissor when the canvas was created or the last scissor that the user set. let rect = self.current_scissor.get(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Scissor(rect.0, rect.1, rect.2, rect.3))) - .unwrap() + self.send_command(WebGLCommand::Scissor(rect.0, rect.1, rect.2, rect.3)); + } + + pub fn webgl_sender(&self) -> WebGLMsgSender { + self.webgl_sender.clone() } - pub fn ipc_renderer(&self) -> IpcSender<CanvasMsg> { - self.ipc_renderer.clone() + #[inline] + pub fn send_command(&self, command: WebGLCommand) { + self.webgl_sender.send(command).unwrap(); } - pub fn send_renderer_message(&self, msg: CanvasMsg) { - self.ipc_renderer.send(msg).unwrap(); + #[inline] + pub fn send_vr_command(&self, command: WebVRCommand) { + self.webgl_sender.send_vr(command).unwrap(); } pub fn get_extension_manager<'a>(&'a self) -> &'a WebGLExtensions { @@ -370,9 +385,7 @@ impl WebGLRenderingContext { self.current_vertex_attrib_0.set((x, y, z, w)) } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::VertexAttrib(indx, x, y, z, w))) - .unwrap(); + self.send_command(WebGLCommand::VertexAttrib(indx, x, y, z, w)); } fn get_current_framebuffer_size(&self) -> Option<(i32, i32)> { @@ -705,8 +718,8 @@ impl WebGLRenderingContext { // WebGLContext (probably via GetPixels()). ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::HTMLCanvasElement(canvas) => { if let Some((mut data, size)) = canvas.fetch_all_data() { - byte_swap(&mut data); // Pixels got from Canvas have already alpha premultiplied + byte_swap(&mut data); (data, size, true) } else { return Err(()); @@ -945,9 +958,7 @@ impl WebGLRenderingContext { // GL_UNPACK_ALIGNMENT, while for textures from images or // canvas (produced by rgba8_image_to_tex_image_data()), it // will be 1. - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::PixelStorei(constants::UNPACK_ALIGNMENT, unpacking_alignment as i32))) - .unwrap(); + self.send_command(WebGLCommand::PixelStorei(constants::UNPACK_ALIGNMENT, unpacking_alignment as i32)); let format = internal_format.as_gl_constant(); let data_type = data_type.as_gl_constant(); @@ -961,9 +972,7 @@ impl WebGLRenderingContext { data_type, pixels); - self.ipc_renderer - .send(CanvasMsg::WebGL(msg)) - .unwrap(); + self.send_command(msg); if let Some(fb) = self.bound_framebuffer.get() { fb.invalidate_texture(&*texture); @@ -1005,9 +1014,7 @@ impl WebGLRenderingContext { // GL_UNPACK_ALIGNMENT, while for textures from images or // canvas (produced by rgba8_image_to_tex_image_data()), it // will be 1. - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::PixelStorei(constants::UNPACK_ALIGNMENT, unpacking_alignment as i32))) - .unwrap(); + self.send_command(WebGLCommand::PixelStorei(constants::UNPACK_ALIGNMENT, unpacking_alignment as i32)); // TODO(emilio): convert colorspace if requested let msg = WebGLCommand::TexSubImage2D(target.as_gl_constant(), @@ -1016,9 +1023,7 @@ impl WebGLRenderingContext { format.as_gl_constant(), data_type.as_gl_constant(), pixels); - self.ipc_renderer - .send(CanvasMsg::WebGL(msg)) - .unwrap() + self.send_command(msg); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14 @@ -1035,17 +1040,38 @@ impl WebGLRenderingContext { } fn get_gl_extensions(&self) -> String { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::GetExtensions(sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::GetExtensions(sender)); receiver.recv().unwrap() } + + fn layout_handle(&self) -> webrender_api::ImageKey { + match self.share_mode { + WebGLContextShareMode::SharedTexture => { + // WR using ExternalTexture requires a single update message. + self.webrender_image.get().unwrap_or_else(|| { + let (sender, receiver) = webgl_channel().unwrap(); + self.webgl_sender.send_update_wr_image(sender).unwrap(); + let image_key = receiver.recv().unwrap(); + self.webrender_image.set(Some(image_key)); + + image_key + }) + }, + WebGLContextShareMode::Readback => { + // WR using Readback requires to update WR image every frame + // in order to send the new raw pixels. + let (sender, receiver) = webgl_channel().unwrap(); + self.webgl_sender.send_update_wr_image(sender).unwrap(); + receiver.recv().unwrap() + } + } + } } impl Drop for WebGLRenderingContext { fn drop(&mut self) { - self.ipc_renderer.send(CanvasMsg::Common(CanvasCommonMsg::Close)).unwrap(); + self.webgl_sender.send_remove().unwrap(); } } @@ -1101,45 +1127,36 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11 fn Flush(&self) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Flush)) - .unwrap(); + self.send_command(WebGLCommand::Flush); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11 fn Finish(&self) { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Finish(sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::Finish(sender)); receiver.recv().unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1 fn DrawingBufferWidth(&self) -> i32 { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DrawingBufferWidth(sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::DrawingBufferWidth(sender)); receiver.recv().unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1 fn DrawingBufferHeight(&self) -> i32 { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DrawingBufferHeight(sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::DrawingBufferHeight(sender)); receiver.recv().unwrap() } #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 unsafe fn GetBufferParameter(&self, _cx: *mut JSContext, target: u32, parameter: u32) -> JSVal { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::GetBufferParameter(target, parameter, sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::GetBufferParameter(target, parameter, sender)); + match handle_potential_webgl_error!(self, receiver.recv().unwrap(), WebGLParameter::Invalid) { WebGLParameter::Int(val) => Int32Value(val), WebGLParameter::Bool(_) => panic!("Buffer parameter should not be bool"), @@ -1205,10 +1222,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { } } - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::GetParameter(parameter, sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::GetParameter(parameter, sender)); + match handle_potential_webgl_error!(self, receiver.recv().unwrap(), WebGLParameter::Invalid) { WebGLParameter::Int(val) => Int32Value(val), WebGLParameter::Bool(val) => BooleanValue(val), @@ -1243,13 +1259,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.2 fn GetContextAttributes(&self) -> Option<WebGLContextAttributes> { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); // If the send does not succeed, assume context lost - if let Err(_) = self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::GetContextAttributes(sender))) { + if self.webgl_sender.send(WebGLCommand::GetContextAttributes(sender)).is_err() { return None; } + let attrs = receiver.recv().unwrap(); Some(WebGLContextAttributes { @@ -1285,12 +1301,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn ActiveTexture(&self, texture: u32) { - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::ActiveTexture(texture))).unwrap(); + self.send_command(WebGLCommand::ActiveTexture(texture)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn BlendColor(&self, r: f32, g: f32, b: f32, a: f32) { - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::BlendColor(r, g, b, a))).unwrap(); + self.send_command(WebGLCommand::BlendColor(r, g, b, a)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 @@ -1299,7 +1315,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidEnum); } - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::BlendEquation(mode))).unwrap(); + self.send_command(WebGLCommand::BlendEquation(mode)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 @@ -1308,9 +1324,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidEnum); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::BlendEquationSeparate(mode_rgb, mode_alpha))) - .unwrap(); + self.send_command(WebGLCommand::BlendEquationSeparate(mode_rgb, mode_alpha)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 @@ -1327,9 +1341,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidOperation); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::BlendFunc(src_factor, dest_factor))) - .unwrap(); + self.send_command(WebGLCommand::BlendFunc(src_factor, dest_factor)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 @@ -1346,8 +1358,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidOperation); } - self.ipc_renderer.send( - CanvasMsg::WebGL(WebGLCommand::BlendFuncSeparate(src_rgb, dest_rgb, src_alpha, dest_alpha))).unwrap(); + self.send_command(WebGLCommand::BlendFuncSeparate(src_rgb, dest_rgb, src_alpha, dest_alpha)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 @@ -1393,9 +1404,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { } else { slot.set(None); // Unbind the current buffer - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::BindBuffer(target, None))) - .unwrap() + self.send_command(WebGLCommand::BindBuffer(target, None)); } } @@ -1420,7 +1429,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { } else { // Bind the default framebuffer let cmd = WebGLCommand::BindFramebuffer(target, WebGLFramebufferBindingRequest::Default); - self.ipc_renderer.send(CanvasMsg::WebGL(cmd)).unwrap(); + self.send_command(cmd); self.bound_framebuffer.set(framebuffer); } } @@ -1442,9 +1451,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { _ => { self.bound_renderbuffer.set(None); // Unbind the currently bound renderbuffer - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::BindRenderbuffer(target, None))) - .unwrap() + self.send_command(WebGLCommand::BindRenderbuffer(target, None)); } } } @@ -1465,9 +1472,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { } else { slot.set(None); // Unbind the currently bound texture - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::BindTexture(target, None))) - .unwrap() + self.send_command(WebGLCommand::BindTexture(target, None)); } } @@ -1585,9 +1590,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if (offset as usize) + data_vec.len() > bound_buffer.capacity() { return Ok(self.webgl_error(InvalidValue)); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::BufferSubData(target, offset as isize, data_vec))) - .unwrap(); + self.send_command(WebGLCommand::BufferSubData(target, offset as isize, data_vec)); Ok(()) } @@ -1670,7 +1673,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { width as i32, height as i32, border as i32); - self.ipc_renderer.send(CanvasMsg::WebGL(msg)).unwrap() + self.send_command(msg); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 @@ -1714,7 +1717,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { x, y, width as i32, height as i32); - self.ipc_renderer.send(CanvasMsg::WebGL(msg)).unwrap(); + self.send_command(msg); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11 @@ -1723,46 +1726,36 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return; } - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::Clear(mask))).unwrap(); + self.send_command(WebGLCommand::Clear(mask)); self.mark_as_dirty(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn ClearColor(&self, red: f32, green: f32, blue: f32, alpha: f32) { self.current_clear_color.set((red, green, blue, alpha)); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::ClearColor(red, green, blue, alpha))) - .unwrap() + self.send_command(WebGLCommand::ClearColor(red, green, blue, alpha)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn ClearDepth(&self, depth: f32) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::ClearDepth(depth as f64))) - .unwrap() + self.send_command(WebGLCommand::ClearDepth(depth as f64)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn ClearStencil(&self, stencil: i32) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::ClearStencil(stencil))) - .unwrap() + self.send_command(WebGLCommand::ClearStencil(stencil)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn ColorMask(&self, r: bool, g: bool, b: bool, a: bool) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::ColorMask(r, g, b, a))) - .unwrap() + self.send_command(WebGLCommand::ColorMask(r, g, b, a)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn CullFace(&self, mode: u32) { match mode { constants::FRONT | constants::BACK | constants::FRONT_AND_BACK => - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::CullFace(mode))) - .unwrap(), + self.send_command(WebGLCommand::CullFace(mode)), _ => self.webgl_error(InvalidEnum), } } @@ -1771,9 +1764,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { fn FrontFace(&self, mode: u32) { match mode { constants::CW | constants::CCW => - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::FrontFace(mode))) - .unwrap(), + self.send_command(WebGLCommand::FrontFace(mode)), _ => self.webgl_error(InvalidEnum), } } @@ -1784,18 +1775,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { constants::EQUAL | constants::LEQUAL | constants::GREATER | constants::NOTEQUAL | constants::GEQUAL | constants::ALWAYS => - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DepthFunc(func))) - .unwrap(), + self.send_command(WebGLCommand::DepthFunc(func)), _ => self.webgl_error(InvalidEnum), } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn DepthMask(&self, flag: bool) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DepthMask(flag))) - .unwrap() + self.send_command(WebGLCommand::DepthMask(flag)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 @@ -1809,26 +1796,20 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidOperation); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DepthRange(near as f64, far as f64))) - .unwrap() + self.send_command(WebGLCommand::DepthRange(near as f64, far as f64)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn Enable(&self, cap: u32) { if self.validate_feature_enum(cap) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Enable(cap))) - .unwrap(); + self.send_command(WebGLCommand::Enable(cap)); } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn Disable(&self, cap: u32) { if self.validate_feature_enum(cap) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Disable(cap))) - .unwrap() + self.send_command(WebGLCommand::Disable(cap)); } } @@ -1843,27 +1824,27 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // generated objects, either here or in the webgl thread // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 fn CreateBuffer(&self) -> Option<Root<WebGLBuffer>> { - WebGLBuffer::maybe_new(self.global().as_window(), self.ipc_renderer.clone()) + WebGLBuffer::maybe_new(self.global().as_window(), self.webgl_sender.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.6 fn CreateFramebuffer(&self) -> Option<Root<WebGLFramebuffer>> { - WebGLFramebuffer::maybe_new(self.global().as_window(), self.ipc_renderer.clone()) + WebGLFramebuffer::maybe_new(self.global().as_window(), self.webgl_sender.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.7 fn CreateRenderbuffer(&self) -> Option<Root<WebGLRenderbuffer>> { - WebGLRenderbuffer::maybe_new(self.global().as_window(), self.ipc_renderer.clone()) + WebGLRenderbuffer::maybe_new(self.global().as_window(), self.webgl_sender.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 fn CreateTexture(&self) -> Option<Root<WebGLTexture>> { - WebGLTexture::maybe_new(self.global().as_window(), self.ipc_renderer.clone()) + WebGLTexture::maybe_new(self.global().as_window(), self.webgl_sender.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 fn CreateProgram(&self) -> Option<Root<WebGLProgram>> { - WebGLProgram::maybe_new(self.global().as_window(), self.ipc_renderer.clone()) + WebGLProgram::maybe_new(self.global().as_window(), self.webgl_sender.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 @@ -1875,7 +1856,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return None; } } - WebGLShader::maybe_new(self.global().as_window(), self.ipc_renderer.clone(), shader_type) + WebGLShader::maybe_new(self.global().as_window(), self.webgl_sender.clone(), shader_type) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 @@ -1999,9 +1980,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return; } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DrawArrays(mode, first, count))) - .unwrap(); + self.send_command(WebGLCommand::DrawArrays(mode, first, count)); self.mark_as_dirty(); }, _ => self.webgl_error(InvalidEnum), @@ -2065,9 +2044,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { constants::LINE_LOOP | constants::LINES | constants::TRIANGLE_STRIP | constants::TRIANGLE_FAN | constants::TRIANGLES => { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DrawElements(mode, count, type_, offset))) - .unwrap(); + self.send_command(WebGLCommand::DrawElements(mode, count, type_, offset)); self.mark_as_dirty(); }, _ => self.webgl_error(InvalidEnum), @@ -2080,9 +2057,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidValue); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::EnableVertexAttribArray(attrib_id))) - .unwrap() + self.send_command(WebGLCommand::EnableVertexAttribArray(attrib_id)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 @@ -2091,9 +2066,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidValue); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::DisableVertexAttribArray(attrib_id))) - .unwrap() + self.send_command(WebGLCommand::DisableVertexAttribArray(attrib_id)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 @@ -2223,11 +2196,11 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { shader_type: u32, precision_type: u32) -> Option<Root<WebGLShaderPrecisionFormat>> { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::GetShaderPrecisionFormat(shader_type, - precision_type, - sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::GetShaderPrecisionFormat(shader_type, + precision_type, + sender)); + match receiver.recv().unwrap() { Ok((range_min, range_max, precision)) => { Some(WebGLShaderPrecisionFormat::new(self.global().as_window(), range_min, range_max, precision)) @@ -2268,8 +2241,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return jsval.get(); } - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::GetVertexAttrib(index, pname, sender))).unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::GetVertexAttrib(index, pname, sender)); match handle_potential_webgl_error!(self, receiver.recv().unwrap(), WebGLParameter::Invalid) { WebGLParameter::Int(val) => Int32Value(val), @@ -2287,8 +2260,8 @@ 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 { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::GetVertexAttribOffset(index, pname, sender))).unwrap(); + 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 } @@ -2307,9 +2280,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { _ => return self.webgl_error(InvalidEnum), } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Hint(target, mode))) - .unwrap() + self.send_command(WebGLCommand::Hint(target, mode)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 @@ -2321,10 +2292,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn IsEnabled(&self, cap: u32) -> bool { if self.validate_feature_enum(cap) { - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::IsEnabled(cap, sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::IsEnabled(cap, sender)); return receiver.recv().unwrap(); } @@ -2362,9 +2331,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidValue); } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::LineWidth(width))) - .unwrap() + self.send_command(WebGLCommand::LineWidth(width)) } // NOTE: Usage of this function could affect rendering while we keep using @@ -2420,9 +2387,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn PolygonOffset(&self, factor: f32, units: f32) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::PolygonOffset(factor, units))) - .unwrap() + self.send_command(WebGLCommand::PolygonOffset(factor, units)) } #[allow(unsafe_code)] @@ -2522,10 +2487,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { _ => return Ok(self.webgl_error(InvalidOperation)), }; - let (sender, receiver) = webrender_api::channel::msg_channel().unwrap(); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::ReadPixels(x, y, width, height, format, pixel_type, sender))) - .unwrap(); + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::ReadPixels(x, y, width, height, format, pixel_type, sender)); let result = receiver.recv().unwrap(); @@ -2541,7 +2504,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn SampleCoverage(&self, value: f32, invert: bool) { - self.ipc_renderer.send(CanvasMsg::WebGL(WebGLCommand::SampleCoverage(value, invert))).unwrap(); + self.send_command(WebGLCommand::SampleCoverage(value, invert)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.4 @@ -2551,9 +2514,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { } self.current_scissor.set((x, y, width, height)); - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Scissor(x, y, width, height))) - .unwrap() + self.send_command(WebGLCommand::Scissor(x, y, width, height)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 @@ -2561,9 +2522,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { match func { constants::NEVER | constants::LESS | constants::EQUAL | constants::LEQUAL | constants::GREATER | constants::NOTEQUAL | constants::GEQUAL | constants::ALWAYS => - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::StencilFunc(func, ref_, mask))) - .unwrap(), + self.send_command(WebGLCommand::StencilFunc(func, ref_, mask)), _ => self.webgl_error(InvalidEnum), } } @@ -2578,27 +2537,21 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { match func { constants::NEVER | constants::LESS | constants::EQUAL | constants::LEQUAL | constants::GREATER | constants::NOTEQUAL | constants::GEQUAL | constants::ALWAYS => - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::StencilFuncSeparate(face, func, ref_, mask))) - .unwrap(), + self.send_command(WebGLCommand::StencilFuncSeparate(face, func, ref_, mask)), _ => self.webgl_error(InvalidEnum), } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn StencilMask(&self, mask: u32) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::StencilMask(mask))) - .unwrap() + self.send_command(WebGLCommand::StencilMask(mask)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn StencilMaskSeparate(&self, face: u32, mask: u32) { match face { constants::FRONT | constants::BACK | constants::FRONT_AND_BACK => - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::StencilMaskSeparate(face, mask))) - .unwrap(), + self.send_command(WebGLCommand::StencilMaskSeparate(face, mask)), _ => return self.webgl_error(InvalidEnum), } } @@ -2607,9 +2560,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { fn StencilOp(&self, fail: u32, zfail: u32, zpass: u32) { if self.validate_stencil_actions(fail) && self.validate_stencil_actions(zfail) && self.validate_stencil_actions(zpass) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::StencilOp(fail, zfail, zpass))) - .unwrap() + self.send_command(WebGLCommand::StencilOp(fail, zfail, zpass)); } else { self.webgl_error(InvalidEnum) } @@ -2624,9 +2575,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_stencil_actions(fail) && self.validate_stencil_actions(zfail) && self.validate_stencil_actions(zpass) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::StencilOpSeparate(face, fail, zfail, zpass))) - .unwrap() + self.send_command(WebGLCommand::StencilOpSeparate(face, fail, zfail, zpass)) } else { self.webgl_error(InvalidEnum) } @@ -2658,9 +2607,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { uniform: Option<&WebGLUniformLocation>, val: f32) { if self.validate_uniform_parameters(uniform, UniformSetterType::Float, &[val]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform1f(uniform.unwrap().id(), val))) - .unwrap() + self.send_command(WebGLCommand::Uniform1f(uniform.unwrap().id(), val)) } } @@ -2669,9 +2616,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { uniform: Option<&WebGLUniformLocation>, val: i32) { if self.validate_uniform_parameters(uniform, UniformSetterType::Int, &[val]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform1i(uniform.unwrap().id(), val))) - .unwrap() + self.send_command(WebGLCommand::Uniform1i(uniform.unwrap().id(), val)) } } @@ -2685,9 +2630,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { let data_vec = typed_array_or_sequence_to_vec::<Int32>(cx, data, ConversionBehavior::Default)?; if self.validate_uniform_parameters(uniform, UniformSetterType::Int, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform1iv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform1iv(uniform.unwrap().id(), data_vec)) } Ok(()) @@ -2703,9 +2646,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { let data_vec = typed_array_or_sequence_to_vec::<Float32>(cx, data, ())?; if self.validate_uniform_parameters(uniform, UniformSetterType::Float, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform1fv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform1fv(uniform.unwrap().id(), data_vec)); } Ok(()) @@ -2716,9 +2657,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { uniform: Option<&WebGLUniformLocation>, x: f32, y: f32) { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatVec2, &[x, y]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform2f(uniform.unwrap().id(), x, y))) - .unwrap() + self.send_command(WebGLCommand::Uniform2f(uniform.unwrap().id(), x, y)); } } @@ -2734,9 +2673,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatVec2, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform2fv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform2fv(uniform.unwrap().id(), data_vec)); } Ok(()) @@ -2749,9 +2686,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::IntVec2, &[x, y]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform2i(uniform.unwrap().id(), x, y))) - .unwrap() + self.send_command(WebGLCommand::Uniform2i(uniform.unwrap().id(), x, y)); } } @@ -2767,9 +2702,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::IntVec2, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform2iv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform2iv(uniform.unwrap().id(), data_vec)); } Ok(()) @@ -2782,9 +2715,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatVec3, &[x, y, z]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform3f(uniform.unwrap().id(), x, y, z))) - .unwrap() + self.send_command(WebGLCommand::Uniform3f(uniform.unwrap().id(), x, y, z)); } } @@ -2800,9 +2731,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatVec3, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform3fv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform3fv(uniform.unwrap().id(), data_vec)) } Ok(()) @@ -2815,9 +2744,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::IntVec3, &[x, y, z]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform3i(uniform.unwrap().id(), x, y, z))) - .unwrap() + self.send_command(WebGLCommand::Uniform3i(uniform.unwrap().id(), x, y, z)) } } @@ -2833,9 +2760,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::IntVec3, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform3iv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform3iv(uniform.unwrap().id(), data_vec)) } Ok(()) @@ -2848,9 +2773,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::IntVec4, &[x, y, z, w]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform4i(uniform.unwrap().id(), x, y, z, w))) - .unwrap() + self.send_command(WebGLCommand::Uniform4i(uniform.unwrap().id(), x, y, z, w)) } } @@ -2867,9 +2790,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::IntVec4, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform4iv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform4iv(uniform.unwrap().id(), data_vec)) } Ok(()) @@ -2882,9 +2803,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatVec4, &[x, y, z, w]) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform4f(uniform.unwrap().id(), x, y, z, w))) - .unwrap() + self.send_command(WebGLCommand::Uniform4f(uniform.unwrap().id(), x, y, z, w)) } } @@ -2900,9 +2819,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatVec4, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Uniform4fv(uniform.unwrap().id(), data_vec))) - .unwrap() + self.send_command(WebGLCommand::Uniform4fv(uniform.unwrap().id(), data_vec)) } Ok(()) @@ -2920,9 +2837,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatMat2, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::UniformMatrix2fv(uniform.unwrap().id(), transpose, data_vec))) - .unwrap() + self.send_command(WebGLCommand::UniformMatrix2fv(uniform.unwrap().id(), transpose, data_vec)); } Ok(()) @@ -2940,9 +2855,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatMat3, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::UniformMatrix3fv(uniform.unwrap().id(), transpose, data_vec))) - .unwrap() + self.send_command(WebGLCommand::UniformMatrix3fv(uniform.unwrap().id(), transpose, data_vec)); } Ok(()) @@ -2960,9 +2873,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { if self.validate_uniform_parameters(uniform, UniformSetterType::FloatMat4, &data_vec) { - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::UniformMatrix4fv(uniform.unwrap().id(), transpose, data_vec))) - .unwrap() + self.send_command(WebGLCommand::UniformMatrix4fv(uniform.unwrap().id(), transpose, data_vec)); } Ok(()) @@ -3098,9 +3009,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { self.bound_attrib_buffers.borrow_mut().insert(attrib_id, JS::from_ref(&*buffer_array)); - let msg = CanvasMsg::WebGL( - WebGLCommand::VertexAttribPointer(attrib_id, size, data_type, normalized, stride, offset as u32)); - self.ipc_renderer.send(msg).unwrap() + let msg = WebGLCommand::VertexAttribPointer(attrib_id, size, data_type, normalized, stride, offset as u32); + self.send_command(msg); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.4 @@ -3109,9 +3019,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return self.webgl_error(InvalidValue) } - self.ipc_renderer - .send(CanvasMsg::WebGL(WebGLCommand::Viewport(x, y, width, height))) - .unwrap() + self.send_command(WebGLCommand::Viewport(x, y, width, height)) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 @@ -3456,13 +3364,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { pub trait LayoutCanvasWebGLRenderingContextHelpers { #[allow(unsafe_code)] - unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg>; + unsafe fn canvas_data_source(&self) -> HTMLCanvasDataSource; } impl LayoutCanvasWebGLRenderingContextHelpers for LayoutJS<WebGLRenderingContext> { #[allow(unsafe_code)] - unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> { - (*self.unsafe_get()).ipc_renderer.clone() + unsafe fn canvas_data_source(&self) -> HTMLCanvasDataSource { + HTMLCanvasDataSource::WebGL((*self.unsafe_get()).layout_handle()) } } |