diff --git a/wgpu-core-remote/src/global/as_hal.rs b/wgpu-core-remote/src/global/as_hal.rs index 33b64142d..27676657e 100644 --- a/wgpu-core-remote/src/global/as_hal.rs +++ b/wgpu-core-remote/src/global/as_hal.rs @@ -118,32 +118,4 @@ impl Global { unsafe { queue.as_hal::() } } - - /// # Safety - /// - /// - The raw blas handle must not be manually destroyed - pub unsafe fn blas_as_hal( - &self, - id: BlasId, - ) -> Option> { - let hub = &self.hub; - - let blas = hub.blas_s.get(id); - - unsafe { blas.as_hal::() } - } - - /// # Safety - /// - /// - The raw tlas handle must not be manually destroyed - pub unsafe fn tlas_as_hal( - &self, - id: TlasId, - ) -> Option> { - let hub = &self.hub; - - let tlas = hub.tlas_s.get(id); - - unsafe { tlas.as_hal::() } - } } diff --git a/wgpu-core-remote/src/global/device.rs b/wgpu-core-remote/src/global/device.rs index 32c136f8f..a6d63fa10 100644 --- a/wgpu-core-remote/src/global/device.rs +++ b/wgpu-core-remote/src/global/device.rs @@ -497,7 +497,6 @@ impl Global { buffer_storage: &Storage>, sampler_storage: &Storage>, texture_view_storage: &Storage>, - tlas_storage: &Storage>, external_texture_storage: &Storage>, ) -> binding_model::BindGroupEntry<'a> { let resolve_buffer = |bb: &BufferBinding| { @@ -510,7 +509,6 @@ impl Global { }; let resolve_sampler = |id: &id::SamplerId| sampler_storage.get(*id); let resolve_view = |id: &id::TextureViewId| texture_view_storage.get(*id); - let resolve_tlas = |id: &id::TlasId| tlas_storage.get(*id); let resolve_external_texture = |id: &id::ExternalTextureId| external_texture_storage.get(*id); let resource = match e.resource { @@ -535,14 +533,11 @@ impl Global { let views = views.iter().map(resolve_view).collect::>(); binding_model::BindingResource::TextureViewArray(Cow::Owned(views)) } - BindingResource::AccelerationStructure(ref tlas) => { - binding_model::BindingResource::AccelerationStructure(resolve_tlas(tlas)) + BindingResource::AccelerationStructure(_) => { + unimplemented!() } - BindingResource::AccelerationStructureArray(ref tlas_array) => { - let tlas_array = tlas_array.iter().map(resolve_tlas).collect::>(); - binding_model::BindingResource::AccelerationStructureArray(Cow::Owned( - tlas_array, - )) + BindingResource::AccelerationStructureArray(_) => { + unimplemented!() } BindingResource::ExternalTexture(ref et) => { binding_model::BindingResource::ExternalTexture(resolve_external_texture(et)) @@ -558,7 +553,6 @@ impl Global { let buffer_guard = hub.buffers.read(); let texture_view_guard = hub.texture_views.read(); let sampler_guard = hub.samplers.read(); - let tlas_guard = hub.tlas_s.read(); let external_texture_guard = hub.external_textures.read(); desc.entries .iter() @@ -568,7 +562,6 @@ impl Global { &buffer_guard, &sampler_guard, &texture_view_guard, - &tlas_guard, &external_texture_guard, ) }) diff --git a/wgpu-core-remote/src/hub.rs b/wgpu-core-remote/src/hub.rs index 22300df63..a7b0b7ba3 100644 --- a/wgpu-core-remote/src/hub.rs +++ b/wgpu-core-remote/src/hub.rs @@ -115,7 +115,7 @@ use wgpu_core::{ device::{queue::Queue, Device}, instance::Adapter, pipeline::{ComputePipeline, PipelineCache, RenderPipeline, ShaderModule}, - resource::{Blas, Buffer, ExternalTexture, QuerySet, Sampler, Texture, TextureView, Tlas}, + resource::{Buffer, ExternalTexture, QuerySet, Sampler, Texture, TextureView}, }; use parking_lot::Mutex; @@ -193,8 +193,6 @@ pub struct Hub { pub(crate) texture_views: Registry>, pub(crate) external_textures: Registry>, pub(crate) samplers: Registry>, - pub(crate) blas_s: Registry>, - pub(crate) tlas_s: Registry>, pub(crate) render_passes: Registry>>, pub(crate) compute_passes: Registry>>, pub(crate) render_bundle_encoders: Registry>>, @@ -229,8 +227,6 @@ impl Hub { texture_views: Registry::new(), external_textures: Registry::new(), samplers: Registry::new(), - blas_s: Registry::new(), - tlas_s: Registry::new(), render_passes: Registry::new(), compute_passes: Registry::new(), render_bundle_encoders: Registry::new(),