Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/core/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use super::*;
use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc;
use std::sync::Arc;

#[doc(hidden)]
pub use crate::context::HasContext;
Expand All @@ -13,7 +14,7 @@ pub use crate::context::HasContext;
///
#[derive(Clone)]
pub struct Context {
context: Rc<crate::context::Context>,
context: Arc<crate::context::Context>,
pub(super) vao: crate::context::VertexArray,
programs: Rc<RefCell<HashMap<String, Program>>>,
effects: Rc<RefCell<HashMap<String, ImageEffect>>>,
Expand All @@ -29,7 +30,7 @@ impl Context {
/// Since the content in the [context](crate::context) module is just a re-export of [glow](https://crates.io/crates/glow),
/// you can also call this method with a reference counter to a glow context created using glow and not the re-export in [context](crate::context).
///
pub fn from_gl_context(context: Rc<crate::context::Context>) -> ThreeDResult<Self> {
pub fn from_gl_context(context: Arc<crate::context::Context>) -> ThreeDResult<Self> {
#[cfg(not(target_arch = "wasm32"))]
unsafe {
// Enable seamless cube map textures
Expand Down
3 changes: 2 additions & 1 deletion src/window/canvas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::window::*;
use serde::Serialize;
use std::cell::RefCell;
use std::rc::Rc;
use std::sync::Arc;
use wasm_bindgen::prelude::*;
use wasm_bindgen::JsCast;
use web_sys::WebGl2RenderingContext;
Expand Down Expand Up @@ -145,7 +146,7 @@ impl Window {
.get_extension("OES_texture_float_linear")
.map_err(|e| CanvasError::OESTextureFloatNotSupported(format!(": {:?}", e)))?;

crate::core::Context::from_gl_context(Rc::new(
crate::core::Context::from_gl_context(Arc::new(
crate::context::Context::from_webgl2_context(context),
))
}
Expand Down
2 changes: 1 addition & 1 deletion src/window/glutin_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ impl Window {
Ok(Window {
windowed_context,
event_loop,
gl: crate::core::Context::from_gl_context(std::rc::Rc::new(context))?,
gl: crate::core::Context::from_gl_context(std::sync::Arc::new(context))?,
})
}

Expand Down
2 changes: 1 addition & 1 deletion src/window/headless.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ impl Context {
let cb = ContextBuilder::new();
let (headless_context, _el) = build_context(cb).unwrap();
let headless_context = unsafe { headless_context.make_current().unwrap() };
let mut c = Self::from_gl_context(std::rc::Rc::new(unsafe {
let mut c = Self::from_gl_context(std::sync::Arc::new(unsafe {
crate::context::Context::from_loader_function(|s| {
headless_context.get_proc_address(s) as *const _
})
Expand Down