Merge branch 'main' of github.com:LuisaGroup/luisa-compute-rs

LuisaGroup · Oct 27, 2023 · aa8d50d · aa8d50d
2 parents 92651e9 + 2c46e77
commit aa8d50d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/luisa_compute/src/lang.rs b/luisa_compute/src/lang.rs
@@ -2,7 +2,7 @@ use std::any::Any;
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
-use std::rc::{Rc, Weak};
+use std::rc::Rc;
 use std::sync::atomic::AtomicUsize;
 use std::sync::{Arc, Weak as WeakArc};
 use std::{env, unreachable};

diff --git a/luisa_compute/src/resource.rs b/luisa_compute/src/resource.rs
@@ -342,7 +342,7 @@ pub struct BufferView<T: Value> {
     pub(crate) offset: usize,
     /// length in #elements
     pub(crate) len: usize,
-    pub(crate) _marker: PhantomData<T>,
+    pub(crate) _marker: PhantomData<fn() -> T>,
 }
 impl<T: Value> BufferView<T> {
     #[inline]
@@ -1057,7 +1057,7 @@ pub struct Tex2dView<T: IoTexel> {
     pub(crate) format: PixelFormat,
     pub(crate) handle: Weak<TextureHandle>,
     pub(crate) level: u32,
-    pub(crate) marker: PhantomData<T>,
+    pub(crate) marker: PhantomData<fn() -> T>,
 }
 #[derive(Clone)]
 pub struct Tex3dView<T: IoTexel> {
@@ -1072,7 +1072,7 @@ pub struct Tex3dView<T: IoTexel> {
     pub(crate) format: PixelFormat,
     pub(crate) handle: Weak<TextureHandle>,
     pub(crate) level: u32,
-    pub(crate) marker: PhantomData<T>,
+    pub(crate) marker: PhantomData<fn() -> T>,
 }
 impl<T: IoTexel> Tex2d<T> {
     pub fn handle(&self) -> api::Texture {