mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 23:11:01 +01:00
Move erroring of create_bind_group into core
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
1 parent
e91f3e37d5
commit
9fcc1dd289
5 files changed
+12
-23
No files matched your search
@@ -429,10 +429,7 @@ impl GPUDevice {
|
||||
entries: Cow::Owned(entries),
|
||||
};
|
||||
|
||||
let (wgpu_bind_group, err) =
|
||||
self.wgpu_device.create_bind_group(&wgpu_descriptor);
|
||||
|
||||
self.error_handler.push_error(err);
|
||||
let wgpu_bind_group = self.wgpu_device.create_bind_group(&wgpu_descriptor);
|
||||
|
||||
GPUBindGroup {
|
||||
wgpu_bind_group,
|
||||
|
||||
+1
-1
@@ -229,7 +229,7 @@ impl Player {
|
||||
}
|
||||
Action::CreateBindGroup(id, desc) => {
|
||||
let resolved_desc = self.resolve_bind_group_descriptor(desc);
|
||||
let (bind_group, _error) = device.create_bind_group(&resolved_desc);
|
||||
let bind_group = device.create_bind_group(&resolved_desc);
|
||||
self.bind_groups.insert(id, bind_group);
|
||||
}
|
||||
Action::DropBindGroup(id) => {
|
||||
|
||||
@@ -496,7 +496,7 @@ impl Global {
|
||||
device_id: DeviceId,
|
||||
desc: &BindGroupDescriptor,
|
||||
id_in: id::BindGroupId,
|
||||
) -> (id::BindGroupId, Option<binding_model::CreateBindGroupError>) {
|
||||
) {
|
||||
let mut hub = self.hub.borrow_mut();
|
||||
let Hub {
|
||||
bind_groups,
|
||||
@@ -564,10 +564,9 @@ impl Global {
|
||||
entries,
|
||||
};
|
||||
|
||||
let (bind_group, error) = device.create_bind_group(&desc);
|
||||
let bind_group = device.create_bind_group(&desc);
|
||||
|
||||
let id = bind_groups.assign(id_in, bind_group);
|
||||
(id, error)
|
||||
bind_groups.assign(id_in, bind_group);
|
||||
}
|
||||
|
||||
pub fn bind_group_drop(&self, bind_group_id: id::BindGroupId) {
|
||||
|
||||
@@ -3640,18 +3640,15 @@ impl Device {
|
||||
pub fn create_bind_group(
|
||||
self: &Arc<Self>,
|
||||
desc: &binding_model::BindGroupDescriptor,
|
||||
) -> (Arc<BindGroup>, Option<CreateBindGroupError>) {
|
||||
) -> Arc<BindGroup> {
|
||||
profiling::scope!("Device::create_bind_group");
|
||||
#[cfg(feature = "trace")]
|
||||
let trace_desc = (&desc).to_trace();
|
||||
|
||||
let (bind_group, error) = match self.create_bind_group_inner(desc) {
|
||||
Ok(bind_group) => (bind_group, None),
|
||||
Err(e) => (
|
||||
BindGroup::invalid(self.clone(), desc.label.to_string(), desc.layout.clone()),
|
||||
Some(e),
|
||||
),
|
||||
};
|
||||
let bind_group = self.create_bind_group_inner(desc).unwrap_or_else(|err| {
|
||||
self.handle_error(err, desc.label.as_deref(), "Device::create_bind_group");
|
||||
BindGroup::invalid(self.clone(), desc.label.to_string(), desc.layout.clone())
|
||||
});
|
||||
|
||||
#[cfg(feature = "trace")]
|
||||
if let Some(ref mut trace) = *self.trace.lock() {
|
||||
@@ -3666,7 +3663,7 @@ impl Device {
|
||||
Arc::as_ptr(&bind_group)
|
||||
);
|
||||
|
||||
(bind_group, error)
|
||||
bind_group
|
||||
}
|
||||
|
||||
// This function expects the provided bind group layout to be resolved
|
||||
|
||||
@@ -1067,11 +1067,7 @@ impl dispatch::DeviceInterface for CoreDevice {
|
||||
entries: Borrowed(&entries),
|
||||
};
|
||||
|
||||
let (wgpu_bind_group, error) = self.wgpu_device.create_bind_group(&descriptor);
|
||||
if let Some(cause) = error {
|
||||
self.wgpu_device
|
||||
.handle_error(cause, desc.label, "Device::create_bind_group");
|
||||
}
|
||||
let wgpu_bind_group = self.wgpu_device.create_bind_group(&descriptor);
|
||||
CoreBindGroup { wgpu_bind_group }.into()
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user