mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 15:31:03 +01:00
[core] Move validity into Arc<Sampler> (#9799)
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
5 files changed
+65
-56
No files matched your search
+1
-1
@@ -171,7 +171,7 @@ impl Player {
|
||||
.expect("invalid external texture");
|
||||
}
|
||||
Action::CreateSampler(id, desc) => {
|
||||
let sampler = device.create_sampler(&desc).expect("create_sampler error");
|
||||
let (sampler, _error) = device.create_sampler(&desc);
|
||||
self.samplers.insert(id, sampler);
|
||||
}
|
||||
Action::DropSampler(id) => {
|
||||
|
||||
@@ -585,51 +585,22 @@ impl Global {
|
||||
desc: &resource::SamplerDescriptor,
|
||||
id_in: Option<id::SamplerId>,
|
||||
) -> (id::SamplerId, Option<resource::CreateSamplerError>) {
|
||||
profiling::scope!("Device::create_sampler");
|
||||
|
||||
let hub = &self.hub;
|
||||
let fid = hub.samplers.prepare(id_in);
|
||||
|
||||
let error = 'error: {
|
||||
let device = self.hub.devices.get(device_id);
|
||||
let device = self.hub.devices.get(device_id);
|
||||
|
||||
let sampler = match device.create_sampler(desc) {
|
||||
Ok(sampler) => sampler,
|
||||
Err(e) => break 'error e,
|
||||
};
|
||||
let (sampler, error) = device.create_sampler(desc);
|
||||
|
||||
#[cfg(feature = "trace")]
|
||||
if let Some(ref mut trace) = *device.trace.lock() {
|
||||
trace.add(trace::Action::CreateSampler(
|
||||
sampler.to_trace(),
|
||||
desc.clone(),
|
||||
));
|
||||
}
|
||||
let id = fid.assign(sampler);
|
||||
|
||||
let id = fid.assign(Fallible::Valid(sampler));
|
||||
api_log!("Device::create_sampler -> {id:?}");
|
||||
|
||||
return (id, None);
|
||||
};
|
||||
|
||||
let id = fid.assign(Fallible::Invalid(Arc::new(desc.label.to_string())));
|
||||
(id, Some(error))
|
||||
(id, error)
|
||||
}
|
||||
|
||||
pub fn sampler_drop(&self, sampler_id: id::SamplerId) {
|
||||
profiling::scope!("Sampler::drop");
|
||||
api_log!("Sampler::drop {sampler_id:?}");
|
||||
|
||||
let hub = &self.hub;
|
||||
|
||||
let _sampler = hub.samplers.remove(sampler_id);
|
||||
|
||||
#[cfg(feature = "trace")]
|
||||
if let Ok(sampler) = _sampler.get() {
|
||||
if let Some(t) = sampler.device.trace.lock().as_mut() {
|
||||
t.add(trace::Action::DropSampler(sampler.to_trace()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn device_create_bind_group_layout(
|
||||
@@ -733,7 +704,7 @@ impl Global {
|
||||
fn resolve_entry<'a>(
|
||||
e: &BindGroupEntry<'a>,
|
||||
buffer_storage: &Storage<Fallible<resource::Buffer>>,
|
||||
sampler_storage: &Storage<Fallible<resource::Sampler>>,
|
||||
sampler_storage: &Storage<Arc<resource::Sampler>>,
|
||||
texture_view_storage: &Storage<Arc<resource::TextureView>>,
|
||||
tlas_storage: &Storage<Fallible<resource::Tlas>>,
|
||||
external_texture_storage: &Storage<Fallible<resource::ExternalTexture>>,
|
||||
@@ -750,12 +721,7 @@ impl Global {
|
||||
})
|
||||
.map_err(binding_model::CreateBindGroupError::from)
|
||||
};
|
||||
let resolve_sampler = |id: &id::SamplerId| {
|
||||
sampler_storage
|
||||
.get(*id)
|
||||
.get()
|
||||
.map_err(binding_model::CreateBindGroupError::from)
|
||||
};
|
||||
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
|
||||
@@ -781,13 +747,10 @@ impl Global {
|
||||
ResolvedBindingResource::BufferArray(Cow::Owned(buffers))
|
||||
}
|
||||
BindingResource::Sampler(ref sampler) => {
|
||||
ResolvedBindingResource::Sampler(resolve_sampler(sampler)?)
|
||||
ResolvedBindingResource::Sampler(resolve_sampler(sampler))
|
||||
}
|
||||
BindingResource::SamplerArray(ref samplers) => {
|
||||
let samplers = samplers
|
||||
.iter()
|
||||
.map(resolve_sampler)
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
let samplers = samplers.iter().map(resolve_sampler).collect::<Vec<_>>();
|
||||
ResolvedBindingResource::SamplerArray(Cow::Owned(samplers))
|
||||
}
|
||||
BindingResource::TextureView(ref view) => {
|
||||
|
||||
@@ -2288,6 +2288,28 @@ impl Device {
|
||||
pub fn create_sampler(
|
||||
self: &Arc<Self>,
|
||||
desc: &resource::SamplerDescriptor,
|
||||
) -> (Arc<Sampler>, Option<resource::CreateSamplerError>) {
|
||||
profiling::scope!("Device::create_sampler");
|
||||
|
||||
let (sampler, error) = match self.create_sampler_inner(desc) {
|
||||
Ok(sampler) => (sampler, None),
|
||||
Err(e) => (Sampler::invalid(Arc::clone(self), desc), Some(e)),
|
||||
};
|
||||
|
||||
#[cfg(feature = "trace")]
|
||||
if let Some(ref mut trace) = *self.trace.lock() {
|
||||
use crate::device::trace::{Action, IntoTrace as _};
|
||||
trace.add(Action::CreateSampler(sampler.to_trace(), desc.clone()));
|
||||
}
|
||||
|
||||
api_log!("Device::create_sampler -> {:?}", Arc::as_ptr(&sampler));
|
||||
|
||||
(sampler, error)
|
||||
}
|
||||
|
||||
pub(crate) fn create_sampler_inner(
|
||||
self: &Arc<Self>,
|
||||
desc: &resource::SamplerDescriptor,
|
||||
) -> Result<Arc<Sampler>, resource::CreateSamplerError> {
|
||||
self.check_is_valid()?;
|
||||
|
||||
@@ -2381,7 +2403,7 @@ impl Device {
|
||||
.map_err(|e| self.handle_hal_error_with_nonfatal_oom(e))?;
|
||||
|
||||
let sampler = Sampler {
|
||||
raw: ManuallyDrop::new(raw),
|
||||
raw: ResourceState::Valid(raw),
|
||||
device: self.clone(),
|
||||
label: desc.label.to_string(),
|
||||
tracking_data: TrackingData::new(self.tracker_indices.samplers.clone()),
|
||||
@@ -3330,7 +3352,7 @@ impl Device {
|
||||
}
|
||||
}
|
||||
|
||||
Ok(sampler.raw())
|
||||
Ok(sampler.raw()?)
|
||||
}
|
||||
|
||||
fn create_texture_binding<'a>(
|
||||
|
||||
@@ -210,7 +210,7 @@ pub struct Hub {
|
||||
pub(crate) textures: Registry<Arc<Texture>>,
|
||||
pub(crate) texture_views: Registry<Arc<TextureView>>,
|
||||
pub(crate) external_textures: Registry<Fallible<ExternalTexture>>,
|
||||
pub(crate) samplers: Registry<Fallible<Sampler>>,
|
||||
pub(crate) samplers: Registry<Arc<Sampler>>,
|
||||
pub(crate) blas_s: Registry<Fallible<Blas>>,
|
||||
pub(crate) tlas_s: Registry<Fallible<Tlas>>,
|
||||
pub(crate) render_passes: Registry<Arc<Mutex<RenderPass>>>,
|
||||
|
||||
@@ -2307,7 +2307,7 @@ pub struct SamplerDescriptor<'a> {
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Sampler {
|
||||
pub(crate) raw: ManuallyDrop<Box<dyn hal::DynSampler>>,
|
||||
pub(crate) raw: ResourceState<Box<dyn hal::DynSampler>>,
|
||||
pub(crate) device: Arc<Device>,
|
||||
/// The `label` from the descriptor used to create the resource.
|
||||
pub(crate) label: String,
|
||||
@@ -2319,19 +2319,43 @@ pub struct Sampler {
|
||||
}
|
||||
|
||||
impl Drop for Sampler {
|
||||
#[allow(trivial_casts)]
|
||||
fn drop(&mut self) {
|
||||
profiling::scope!("Sampler::drop");
|
||||
api_log!("Sampler::drop {:?}", self as *const _);
|
||||
#[cfg(feature = "trace")]
|
||||
if let Some(t) = self.device.trace.lock().as_mut() {
|
||||
t.add(trace::Action::DropSampler(unsafe { trace::to_trace(self) }));
|
||||
}
|
||||
resource_log!("Destroy raw {}", self.error_ident());
|
||||
// SAFETY: We are in the Drop impl and we don't use self.raw anymore after this point.
|
||||
let raw = unsafe { ManuallyDrop::take(&mut self.raw) };
|
||||
unsafe {
|
||||
self.device.raw().destroy_sampler(raw);
|
||||
if let ResourceState::Valid(raw) = mem::replace(&mut self.raw, ResourceState::Invalid) {
|
||||
unsafe {
|
||||
self.device.raw().destroy_sampler(raw);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Sampler {
|
||||
pub(crate) fn raw(&self) -> &dyn hal::DynSampler {
|
||||
self.raw.as_ref()
|
||||
pub(crate) fn raw(&self) -> Result<&dyn hal::DynSampler, InvalidResourceError> {
|
||||
self.raw
|
||||
.as_ref()
|
||||
.valid()
|
||||
.map(|raw| raw.as_ref())
|
||||
.ok_or_else(|| InvalidResourceError(self.error_ident()))
|
||||
}
|
||||
|
||||
pub(crate) fn invalid(device: Arc<Device>, desc: &SamplerDescriptor) -> Arc<Self> {
|
||||
Arc::new(Sampler {
|
||||
raw: ResourceState::Invalid,
|
||||
label: desc.label.to_string(),
|
||||
tracking_data: TrackingData::new(device.tracker_indices.samplers.clone()),
|
||||
device,
|
||||
comparison: desc.compare.is_some(),
|
||||
filtering: desc.mag_filter == wgt::FilterMode::Linear
|
||||
|| desc.min_filter == wgt::FilterMode::Linear
|
||||
|| desc.mipmap_filter == wgt::MipmapFilterMode::Linear,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user