From 0a64455c71886021f437671539cfe804e9d50ed6 Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Mon, 21 Aug 2017 23:23:03 +0200 Subject: [PATCH] Use FnvHashMap in WebGL implementation. --- Cargo.lock | 1 + components/canvas/Cargo.toml | 1 + components/canvas/lib.rs | 1 + components/canvas/webgl_thread.rs | 14 ++++----- .../script/dom/webgl_extensions/extensions.rs | 29 ++++++++++--------- .../script/dom/webglrenderingcontext.rs | 10 +++---- 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dfd50495139..97da598d50d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,6 +329,7 @@ dependencies = [ "compositing 0.0.1", "cssparser 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index d38f8c5aacc..83d91f93bd5 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -15,6 +15,7 @@ canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing"} cssparser = "0.19" euclid = "0.15" +fnv = "1.0" gleam = "0.4" ipc-channel = "0.8" log = "0.3.5" diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs index b9f0823a07d..e26d8c2b582 100644 --- a/components/canvas/lib.rs +++ b/components/canvas/lib.rs @@ -9,6 +9,7 @@ extern crate canvas_traits; extern crate compositing; extern crate cssparser; extern crate euclid; +extern crate fnv; extern crate gleam; extern crate ipc_channel; #[macro_use] extern crate log; diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index b4a612103c2..ef4ccd5794e 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -5,9 +5,9 @@ use canvas_traits::canvas::byte_swap; use canvas_traits::webgl::*; use euclid::Size2D; +use fnv::FnvHashMap; use gleam::gl; use offscreen_gl_context::{GLContext, GLContextAttributes, GLLimits, NativeGLContextMethods}; -use std::collections::HashMap; use std::mem; use std::thread; use super::gl_context::{GLContextFactory, GLContextWrapper}; @@ -26,9 +26,9 @@ pub struct WebGLThread, + contexts: FnvHashMap, /// Cached information for WebGLContexts. - cached_context_info: HashMap, + cached_context_info: FnvHashMap, /// Current bound context. bound_context_id: Option, /// Id generator for new WebGLContexts. @@ -47,8 +47,8 @@ impl WebGLThread WebGLThread(context_id: WebGLContextId, - contexts: &'a HashMap, + contexts: &'a FnvHashMap, bound_id: &mut Option) -> Option<&'a GLContextWrapper> { contexts.get(&context_id).and_then(|ctx| { if Some(context_id) != *bound_id { @@ -349,7 +349,7 @@ impl WebGLThread(context_id: WebGLContextId, - contexts: &'a mut HashMap, + contexts: &'a mut FnvHashMap, bound_id: &mut Option) -> &'a mut GLContextWrapper { let ctx = contexts.get_mut(&context_id).expect("WebGLContext not found!"); if Some(context_id) != *bound_id { diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs index 8cda0a51980..62ee5f26086 100644 --- a/components/script/dom/webgl_extensions/extensions.rs +++ b/components/script/dom/webgl_extensions/extensions.rs @@ -12,13 +12,14 @@ use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderi use dom::bindings::js::Root; use dom::bindings::trace::JSTraceable; use dom::webglrenderingcontext::WebGLRenderingContext; +use fnv::{FnvHashMap, FnvHashSet}; use gleam::gl::GLenum; use heapsize::HeapSizeOf; use js::jsapi::{JSContext, JSObject}; use js::jsval::JSVal; use ref_filter_map::ref_filter_map; use std::cell::Ref; -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use super::{ext, WebGLExtension}; use super::wrapper::{WebGLExtensionWrapper, TypedWebGLExtensionWrapper}; @@ -46,26 +47,26 @@ const DEFAULT_DISABLED_GET_PARAMETER_NAMES: [GLenum; 1] = [ /// WebGL features that are enabled/disabled by WebGL Extensions. #[derive(HeapSizeOf, JSTraceable)] struct WebGLExtensionFeatures { - gl_extensions: HashSet, - disabled_tex_types: HashSet, - not_filterable_tex_types: HashSet, - effective_tex_internal_formats: HashMap, - query_parameter_handlers: HashMap, + gl_extensions: FnvHashSet, + disabled_tex_types: FnvHashSet, + not_filterable_tex_types: FnvHashSet, + effective_tex_internal_formats: FnvHashMap, + query_parameter_handlers: FnvHashMap, /// WebGL Hint() targets enabled by extensions. - hint_targets: HashSet, + hint_targets: FnvHashSet, /// WebGL GetParameter() names enabled by extensions. - disabled_get_parameter_names: HashSet, + disabled_get_parameter_names: FnvHashSet, } impl Default for WebGLExtensionFeatures { fn default() -> WebGLExtensionFeatures { WebGLExtensionFeatures { - gl_extensions: HashSet::new(), + gl_extensions: Default::default(), disabled_tex_types: DEFAULT_DISABLED_TEX_TYPES.iter().cloned().collect(), not_filterable_tex_types: DEFAULT_NOT_FILTERABLE_TEX_TYPES.iter().cloned().collect(), - effective_tex_internal_formats: HashMap::new(), - query_parameter_handlers: HashMap::new(), - hint_targets: HashSet::new(), + effective_tex_internal_formats: Default::default(), + query_parameter_handlers: Default::default(), + hint_targets: Default::default(), disabled_get_parameter_names: DEFAULT_DISABLED_GET_PARAMETER_NAMES.iter().cloned().collect(), } } @@ -90,8 +91,8 @@ impl WebGLExtensions { pub fn init_once(&self, cb: F) where F: FnOnce() -> String { if self.extensions.borrow().len() == 0 { let gl_str = cb(); - self.features.borrow_mut().gl_extensions = HashSet::from_iter(gl_str.split(&[',', ' '][..]) - .map(|s| s.into())); + self.features.borrow_mut().gl_extensions = FnvHashSet::from_iter(gl_str.split(&[',', ' '][..]) + .map(|s| s.into())); self.register_all_extensions(); } } diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index a4e11c89c5e..ed5ff53bfe7 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -44,6 +44,7 @@ use dom::webgluniformlocation::WebGLUniformLocation; use dom::window::Window; use dom_struct::dom_struct; use euclid::Size2D; +use fnv::FnvHashMap; use half::f16; use js::conversions::ConversionBehavior; use js::jsapi::{JSContext, JSObject, Type, Rooted}; @@ -55,7 +56,6 @@ use offscreen_gl_context::{GLContextAttributes, GLLimits}; use script_layout_interface::HTMLCanvasDataSource; use servo_config::prefs::PREFS; use std::cell::Cell; -use std::collections::HashMap; use webrender_api; type ImagePixelResult = Result<(Vec, Size2D, bool), ()>; @@ -151,7 +151,7 @@ pub struct WebGLRenderingContext { bound_texture_cube_map: MutNullableJS, bound_buffer_array: MutNullableJS, bound_buffer_element_array: MutNullableJS, - bound_attrib_buffers: DOMRefCell>>, + bound_attrib_buffers: DOMRefCell>>, current_program: MutNullableJS, #[ignore_heap_size_of = "Because it's small"] current_vertex_attrib_0: Cell<(f32, f32, f32, f32)>, @@ -194,7 +194,7 @@ impl WebGLRenderingContext { bound_texture_cube_map: MutNullableJS::new(None), bound_buffer_array: MutNullableJS::new(None), bound_buffer_element_array: MutNullableJS::new(None), - bound_attrib_buffers: DOMRefCell::new(HashMap::new()), + bound_attrib_buffers: DOMRefCell::new(Default::default()), bound_renderbuffer: MutNullableJS::new(None), current_program: MutNullableJS::new(None), current_vertex_attrib_0: Cell::new((0f32, 0f32, 0f32, 1f32)), @@ -239,12 +239,12 @@ impl WebGLRenderingContext { } } - pub fn borrow_bound_attrib_buffers(&self) -> Ref>> { + pub fn borrow_bound_attrib_buffers(&self) -> Ref>> { self.bound_attrib_buffers.borrow() } pub fn set_bound_attrib_buffers<'a, T>(&self, iter: T) where T: Iterator { - *self.bound_attrib_buffers.borrow_mut() = HashMap::from_iter(iter.map(|(k,v)| (k, JS::from_ref(v)))); + *self.bound_attrib_buffers.borrow_mut() = FnvHashMap::from_iter(iter.map(|(k,v)| (k, JS::from_ref(v)))); } pub fn bound_buffer_element_array(&self) -> Option> {