From e0de9f54e1c75c770e20e433a297c1bb6fd47596 Mon Sep 17 00:00:00 2001 From: Vecvec Date: Sun, 28 Jan 2024 06:44:41 +1300 Subject: [PATCH] fix clippy macos and web --- wgpu-hal/src/metal/command.rs | 4 ++-- wgpu-hal/src/metal/device.rs | 5 ++--- wgpu/src/backend/web.rs | 9 +++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/wgpu-hal/src/metal/command.rs b/wgpu-hal/src/metal/command.rs index b492ddba8c..d08cb9a73f 100644 --- a/wgpu-hal/src/metal/command.rs +++ b/wgpu-hal/src/metal/command.rs @@ -381,8 +381,8 @@ impl crate::CommandEncoder for super::CommandEncoder { unsafe fn copy_acceleration_structure_to_acceleration_structure( &mut self, - _src: &crate::metal::Api::AccelerationStructure, - _dst: &crate::metal::Api::AccelerationStructure, + _src: &super::AccelerationStructure, + _dst: &super::AccelerationStructure, copy: AccelerationStructureCopy, ) { unimplemented!() diff --git a/wgpu-hal/src/metal/device.rs b/wgpu-hal/src/metal/device.rs index 306651076d..1370107c00 100644 --- a/wgpu-hal/src/metal/device.rs +++ b/wgpu-hal/src/metal/device.rs @@ -5,7 +5,6 @@ use std::{ sync::{atomic, Arc}, thread, time, }; -use wgt::BufferAddress; use super::conv; use crate::auxil::map_naga_stage; @@ -1231,8 +1230,8 @@ impl crate::Device for super::Device { unsafe fn get_acceleration_structure_compact_size( &self, - acceleration_structure: &crate::metal::Api::AccelerationStructure, - ) -> BufferAddress { + acceleration_structure: &super::AccelerationStructure, + ) -> wgt::BufferAddress { unimplemented!() } diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index 916d69e9ac..4d0753c769 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -3498,6 +3498,15 @@ impl crate::context::Context for Context { fn tlas_drop(&self, _tlas: &Self::TlasId, _tlas_data: &Self::TlasData) { unimplemented!("Raytracing not implemented for web"); } + + fn command_encoder_compact_blas( + &self, + encoder: &Self::CommandEncoderId, + device_data: &Self::CommandEncoderData, + blas_id: &Self::BlasId, + ) -> (Self::BlasId, Option, Self::BlasData) { + unimplemented!("Raytracing not implemented for web"); + } } pub(crate) type SurfaceOutputDetail = ();